|
@@ -240,7 +240,8 @@ namespace PRSDesktop
|
|
|
|
|
|
public void LoadColumns(string column, Dictionary<string, string> columns)
|
|
|
{
|
|
|
- columns.Clear();
|
|
|
+ //columns.Clear(); commented this out as OtherColumns was being cleared and never loading the required properties. Do we need to clear them?
|
|
|
+
|
|
|
var comps = column.Split('.').ToList();
|
|
|
comps.RemoveAt(comps.Count - 1);
|
|
|
var prefix = string.Format("{0}.", string.Join(".", comps));
|
|
@@ -705,8 +706,13 @@ namespace PRSDesktop
|
|
|
foreach (var key in values.Keys)
|
|
|
{
|
|
|
CoreUtils.SetPropertyValue(SelectedAssignment, key, values[key]);
|
|
|
- if (key.Equals("Task.ID"))
|
|
|
+ if (key.Equals("Task.ID"))
|
|
|
+ {
|
|
|
Job.IsEnabled = values[key] == null || ((Guid)values[key]).Equals(Guid.Empty);
|
|
|
+ if (values.ContainsKey("Job.ID"))
|
|
|
+ SelectedAssignment.JobLink.ID = (Guid) values["Job.ID"];
|
|
|
+
|
|
|
+ }
|
|
|
if (key.Equals("JobLink.ID"))
|
|
|
{
|
|
|
ConfigureEditor(ITP);
|
|
@@ -1304,7 +1310,5 @@ namespace PRSDesktop
|
|
|
{
|
|
|
args.Status = CalendarHandledStatus.Handled;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
}
|