Changeset 16235 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs
- Timestamp:
- 10/18/18 14:07:32 (6 years ago)
- Location:
- branches/2931_OR-Tools_LP_MIP
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2931_OR-Tools_LP_MIP
- Property svn:mergeinfo changed
/branches/2916_IndexedDataTableSerialization (added) merged: 15918 /trunk merged: 16168-16169,16177,16179,16184-16187,16202-16209,16211,16213,16216,16218-16219,16221,16223-16224,16232
- Property svn:mergeinfo changed
-
branches/2931_OR-Tools_LP_MIP/HeuristicLab.Clients.Hive.Administrator
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Clients.Hive.Administrator merged: 16184-16187,16202,16205,16208-16209,16211
- Property svn:mergeinfo changed
-
branches/2931_OR-Tools_LP_MIP/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs
r16139 r16235 118 118 endDateTimePicker.Enabled = !indefiniteCheckBox.Checked; 119 119 } 120 SetEnabledStateOfControls(); 120 121 RegisterControlEvents(); 121 122 } … … 134 135 135 136 if (Content != null) { 136 var parentProject = HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).LastOrDefault(); 137 if (parentProject == null || parentProject.EndDate.HasValue) { 137 //var parentProject = HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).LastOrDefault(); 138 var parentProject = HiveAdminClient.Instance.Projects.FirstOrDefault(x => x.Id == Content.ParentProjectId); 139 if ((!IsAdmin() && (parentProject == null || parentProject.EndDate.HasValue)) 140 || (IsAdmin() && parentProject != null && parentProject.EndDate.HasValue)) { 138 141 indefiniteCheckBox.Enabled = false; 139 142 } 140 143 141 if ( !IsAdmin() && !HiveAdminClient.Instance.CheckOwnershipOfParentProject(Content, UserInformation.Instance.User.Id)) {144 if (Content.Id != Guid.Empty && !IsAdmin() && !HiveAdminClient.Instance.CheckOwnershipOfParentProject(Content, UserInformation.Instance.User.Id)) { 142 145 ownerComboBox.Enabled = false; 143 146 startDateTimePicker.Enabled = false;
Note: See TracChangeset
for help on using the changeset viewer.