IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Notify: name removed

Browse Source
This commit is contained in:
pavelbannov 2019-08-22 18:59:49 +03:00
parent 303bc66028
commit 39bac7cc64
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/ASC.Common/protos/NotifyItem.proto
View File

@ -14,8 +14,7 @@ message NotifyItem {
}
message NotifyActionItem {
string ID = 1;
string Name = 2;
string ID = 1;
}
message Recipient {

2
common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
View File

@ -529,7 +529,7 @@ namespace ASC.Notify.Engine
pattern = apProvider.GetPattern(request.NotifyAction, senderName);
}
request.Patterns[i] = pattern ?? throw new NotifyException(string.Format("For action \"{0}\" by sender \"{1}\" no one patterns getted.", request.NotifyAction.Name, senderName));
request.Patterns[i] = pattern ?? throw new NotifyException(string.Format("For action \"{0}\" by sender \"{1}\" no one patterns getted.", request.NotifyAction.ID, senderName));
}
}
}

4
common/ASC.Core.Common/Notify/Model/NotifyAction.cs
View File

@ -49,12 +49,12 @@ namespace ASC.Notify.Model
public static implicit operator NotifyActionItem(NotifyAction cache)
{
return new NotifyActionItem() { ID = cache.ID, Name = cache.Name };
return new NotifyActionItem() { ID = cache.ID };
}
public static explicit operator NotifyAction(NotifyActionItem cache)
{
return new NotifyAction(cache.ID, cache.Name);
return new NotifyAction(cache.ID);
}
public override bool Equals(object obj)

2
web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
View File

@ -1133,7 +1133,7 @@ namespace ASC.Web.Studio.Core.Notify
if (action == null) continue;
log.InfoFormat(@"Send letter personal '{1}' to {0} culture {2}. tenant id: {3} user culture {4} create on {5} now date {6}",
user.Email, action.Name, culture, tenant.TenantId, user.GetCulture(), user.CreateDate, scheduleDate.Date);
user.Email, action.ID, culture, tenant.TenantId, user.GetCulture(), user.CreateDate, scheduleDate.Date);
sendCount++;