case 3826
This commit is contained in:
@@ -1143,7 +1143,6 @@ Global
|
|||||||
{9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.ReleaseX86AyaNova|x86.ActiveCfg = Debug|Any CPU
|
{9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.ReleaseX86AyaNova|x86.ActiveCfg = Debug|Any CPU
|
||||||
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|.NET.ActiveCfg = Debug|Any CPU
|
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|.NET.ActiveCfg = Debug|Any CPU
|
||||||
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||||
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||||
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|WBI.ActiveCfg = Debug|Any CPU
|
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|WBI.ActiveCfg = Debug|Any CPU
|
||||||
|
|||||||
@@ -180,8 +180,15 @@ namespace GZTW.AyaNova.BLL
|
|||||||
UserPickList up=UserPickList.GetListOfOneSpecificUser(this.FromID);
|
UserPickList up=UserPickList.GetListOfOneSpecificUser(this.FromID);
|
||||||
|
|
||||||
//From
|
//From
|
||||||
sb.Append(LocalizedTextTable.GetLocalizedTextDirect("Memo.Label.FromID", mLanguage) + ": " + up[0].Name +"\r\n");
|
//case 3826
|
||||||
|
if (up.Count == 0)//User not found (utility user probably)
|
||||||
|
{
|
||||||
|
sb.Append(LocalizedTextTable.GetLocalizedTextDirect("Memo.Label.FromID", mLanguage) + ": -\r\n");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sb.Append(LocalizedTextTable.GetLocalizedTextDirect("Memo.Label.FromID", mLanguage) + ": " + up[0].Name + "\r\n");
|
||||||
|
}
|
||||||
|
|
||||||
//Sent
|
//Sent
|
||||||
sb.Append(LocalizedTextTable.GetLocalizedTextDirect("Memo.Label.Sent", mLanguage) + ": " + this.SentRelative + " (" + this.Created +")\r\n");
|
sb.Append(LocalizedTextTable.GetLocalizedTextDirect("Memo.Label.Sent", mLanguage) + ": " + this.SentRelative + " (" + this.Created +")\r\n");
|
||||||
|
|||||||
@@ -4246,7 +4246,20 @@ namespace GZTW.AyaNova.BLL
|
|||||||
|
|
||||||
Memo mwarn = Memo.NewItem();
|
Memo mwarn = Memo.NewItem();
|
||||||
mwarn.ToID = User.AdministratorID;
|
mwarn.ToID = User.AdministratorID;
|
||||||
mwarn.FromID = User.CurrentThreadUserID;
|
|
||||||
|
//case 3826
|
||||||
|
if (User.CurrentUserType == UserTypes.Utility)
|
||||||
|
{
|
||||||
|
//Utility accounts should not be sending memos, it fucks up downstream
|
||||||
|
//trying to view the memo, also it's confusing
|
||||||
|
mwarn.FromID = User.AdministratorID;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mwarn.FromID = User.CurrentThreadUserID;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
mwarn.Subject = "SYSTEM WARNING: Preventive Maintenance WO PROBLEM";
|
mwarn.Subject = "SYSTEM WARNING: Preventive Maintenance WO PROBLEM";
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
sb.AppendLine("This is an automated message sent on behalf of the current user from the \"NewServiceWorkorderFromPM\" module.");
|
sb.AppendLine("This is an automated message sent on behalf of the current user from the \"NewServiceWorkorderFromPM\" module.");
|
||||||
|
|||||||
Reference in New Issue
Block a user