C2015-022 Separate Windows Upgrade – moved RemoveEnhancedFromConfig from AuditExt.cs

C2015-022 Separate Windows Upgrade – new call to RemoveEnhancedFromConfig
C2015-022 Separate Windows Upgrade – needed to check ProcessID instead of SessionID
This commit is contained in:
2018-03-12 14:34:01 +00:00
parent f87f541a16
commit 60e9131698
3 changed files with 46 additions and 5 deletions

View File

@@ -173,19 +173,20 @@ namespace VEPROMS.CSLA.Library
}
}
bool rv = true;
// C2015-022 part of separate windows logic, check the processID instead of the sessionID
foreach (SessionInfo si in sil)
{
if (si.SessionID != this.SessionID && objectType == CheckOutType.Procedure)
if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Procedure)
{
message = string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(objectID).MyProcedure.DisplayNumber, si.UserID);
rv = rv && false;
}
else if (si.SessionID != this.SessionID && objectType == CheckOutType.Document)
else if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Document)
{
message = string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(objectID).DocumentEntries[0].MyContent.Text, si.UserID);
rv = rv && false;
}
else if (si.SessionID != this.SessionID && objectType == CheckOutType.DocVersion)
else if (si.ProcessID != this.ProcessID && objectType == CheckOutType.DocVersion)
{
// gets here if other session has working draft open & click on sam working draft.
OwnerInfo oi = OwnerInfo.GetBySessionIDandVersionID(si.SessionID, objectID);
@@ -199,7 +200,7 @@ namespace VEPROMS.CSLA.Library
message = message + string.Format("The working draft is already checked out to {0}", si.UserID);
rv = rv && false;
}
else if (si.SessionID != this.SessionID && objectType == CheckOutType.Folder)
else if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Folder)
{
// gets here if other session has working draft open & click on folder above. Gets here
// if other session has wd open and click on top folder - query returns empty.