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

Added step path data to resulting search items

Browse Source 
Added code to handle when content audit that has 0 for delete status and a null action date
Added code to handle content audit that does not contain any config information
This commit is contained in:
Rich 2015-02-20 02:58:50 +00:00
parent ea8c38cd28
commit c8618a23d4
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -5265,7 +5265,7 @@ namespace VEPROMS.CSLA.Library
} }
itemInfo.AddContent(dr); itemInfo.AddContent(dr);
itemInfo._SearchDVPath = dr.GetString("DVPath"); itemInfo._SearchDVPath = dr.GetString("DVPath");
//itemInfo._SearchPath = dr.GetString("Path"); itemInfo._SearchPath = dr.GetString("Path");
IsReadOnly = false; IsReadOnly = false;
this.Add(itemInfo); this.Add(itemInfo);
IsReadOnly = true; IsReadOnly = true;

2
PROMS/Volian.Controls.Library/DisplayHistory.cs
View File

@ -197,7 +197,7 @@ namespace Volian.Controls.Library
ContentAuditInfo cai = lbChanges.SelectedItem as ContentAuditInfo; ContentAuditInfo cai = lbChanges.SelectedItem as ContentAuditInfo;
if (cai != null) if (cai != null)
{ {
if (cai.DeleteStatus > 0) if (cai.DeleteStatus > 0 || (cai.DeleteStatus == 0 && cai.ActionWhen.Year == DateTime.MinValue.Year))
MessageBox.Show("This item has been deleted.","Deleted Item",MessageBoxButtons.OK,MessageBoxIcon.Exclamation); MessageBox.Show("This item has been deleted.","Deleted Item",MessageBoxButtons.OK,MessageBoxIcon.Exclamation);
else else
OnHistorySelectionChanged(new DisplayHistoryEventArgs(cai.ItemID)); OnHistorySelectionChanged(new DisplayHistoryEventArgs(cai.ItemID));

8
PROMS/Volian.Print.Library/PDFChronologyReport.cs
View File

@ -379,10 +379,16 @@ namespace Volian.Print.Library
{ {
string txt = ItemInfo.ConvertToDisplayText(cai.Text); string txt = ItemInfo.ConvertToDisplayText(cai.Text);
if (MyProc.MyDocVersion.MultiUnitCount > 1) if (MyProc.MyDocVersion.MultiUnitCount > 1)
{
System.Xml.XmlNode nd;
if (cai.Config == string.Empty)
nd = null;
else
{ {
System.Xml.XmlDocument xd = new System.Xml.XmlDocument(); System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
xd.LoadXml(cai.Config); xd.LoadXml(cai.Config);
System.Xml.XmlNode nd = xd.SelectSingleNode("//MasterSlave"); nd = xd.SelectSingleNode("//MasterSlave");
}
if (nd == null) if (nd == null)
txt += "\r\n\r\nApplicable to all units"; txt += "\r\n\r\nApplicable to all units";
else else