Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Wiki Activity

Bring up to date with Dev -- clearing merge conflicts

Browse Source
This commit is contained in:
mschill
2026-09-30 10:23:57 -04:00
parent 8c8c876309 abe0444275
commit b2741d341c
16 changed files with 11 additions and 12789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PROMS/VEPROMS.CSLA.Library/Extension/MultiUserExt.cs
+3 -3
View File
@@ -178,7 +178,7 @@ namespace VEPROMS.CSLA.Library
}
else if (si.ProcessID != 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);
message = string.Format("The document {0} is already checked out to {1}", ItemInfo.ConvertToDisplayText(DocumentInfo.Get(objectID).DocumentEntries[0].MyContent.Text), si.UserID);
rv = rv && false;
}
else if (si.ProcessID != ProcessID && objectType == CheckOutType.DocVersion)
@@ -198,7 +198,7 @@ namespace VEPROMS.CSLA.Library
message = message + string.Format("The procedure {0} is already checked out to {1}", name, si.UserID) + Environment.NewLine;
}
else if (oi.OwnerType == 1)
message = message + string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text, si.UserID) + Environment.NewLine;
message = message + string.Format("The document {0} is already checked out to {1}", ItemInfo.ConvertToDisplayText(DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text), si.UserID) + Environment.NewLine;
else if (oi.OwnerType == 2)
message += string.Format("The working draft is already checked out to {0}", si.UserID);
rv = rv && false;
@@ -221,7 +221,7 @@ namespace VEPROMS.CSLA.Library
message = message + string.Format("The procedure {0} is already checked out to {1}", name, si.UserID) + Environment.NewLine;
}
else if (oi.OwnerType == 1)
message = message + string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text, si.UserID) + Environment.NewLine;
message = message + string.Format("The document {0} is already checked out to {1}", ItemInfo.ConvertToDisplayText(DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text), si.UserID) + Environment.NewLine;
else if (oi.OwnerType == 2)
message += string.Format("The working draft is already checked out to {0}", si.UserID);
else if (oi.OwnerType == 3)