Changeset 16040 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views

Timestamp:

08/02/18 16:58:48 (6 years ago)

Author:

jzenisek

Message:

#2839: fixed handling of project related updates for project owners, who are no admins and do not own parent projects

Location:

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views

Files:

• ProjectResourcesView.cs (modified) (2 diffs)
• ProjectView.cs (modified) (5 diffs)
• ProjectsView.cs (modified) (1 diff)

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs

@@ -159 +159 @@
         || newIncludedResources.Contains(checkedResource)) {
         e.Cancel = true;
-      } else if (!HiveRoles.CheckAdminUserPermissions()) {
-          if (!HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).Any() || projectExclusiveResources.Contains(checkedResource)) {
+      } else if (!IsAdmin()) {
+          if (!HiveAdminClient.Instance.CheckOwnershipOfParentProject(Content, UserInformation.Instance.User.Id) 
+            || !HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).Any() 
+            || projectExclusiveResources.Contains(checkedResource)) {
             e.Cancel = true;
           }
@@ -367 +369 @@
           newNode.Checked = true;
           if(!HiveRoles.CheckAdminUserPermissions()) {
-            if (!HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).Any() 
+            if (!HiveAdminClient.Instance.CheckOwnershipOfParentProject(Content, UserInformation.Instance.User.Id) 
+              || !HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).Any() 
               || projectExclusiveResources.Contains(newResource)) {
               newNode.ForeColor = SystemColors.GrayText;

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs

@@ -111 +111 @@
       endDateTimePicker.Enabled = enabled && Content.EndDate.HasValue;
       indefiniteCheckBox.Enabled = enabled;
+
+      if (!IsAdmin() && !HiveAdminClient.Instance.CheckOwnershipOfParentProject(Content, UserInformation.Instance.User.Id)) {
+        ownerComboBox.Enabled = false;
+        startDateTimePicker.Enabled = false;
+        endDateTimePicker.Enabled = false;
+        indefiniteCheckBox.Enabled = false;
+      } 
     }
     #endregion
@@ -198 +205 @@
     private void startDateTimePicker_ValueChanged(object sender, EventArgs e) {
       if (Content == null) return;
+ 
       if (!Content.EndDate.HasValue || startDateTimePicker.Value > Content.EndDate)
         endDateTimePicker.Value = startDateTimePicker.Value;
@@ -206 +214 @@
     private void endDateTimePicker_ValueChanged(object sender, EventArgs e) {
       if (Content == null) return;
+
       if (endDateTimePicker.Value < startDateTimePicker.Value)
         endDateTimePicker.Value = startDateTimePicker.Value;
@@ -214 +223 @@
     private void indefiniteCheckBox_CheckedChanged(object sender, EventArgs e) {
       if (Content == null) return;
+
       var newEndDate = indefiniteCheckBox.Checked ? (DateTime?)null : endDateTimePicker.Value;
       endDateTimePicker.Enabled = !indefiniteCheckBox.Checked;
@@ -233 +243 @@
     }
 
+    private bool IsAdmin() {
+      return HiveRoles.CheckAdminUserPermissions();
+    }
+
     private void ShowHiveInformationDialog() {
       if (InvokeRequired) Invoke((Action)ShowHiveInformationDialog);

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs

@@ -233 +233 @@
 
       lock (locker) {
+        // for details go to ChangeSelectedProject(..)
         if (!removeButton.Enabled) return;
         removeButton.Enabled = false;
       }
 
-      if (Content.Any(x => x.ParentProjectId == selectedProject.Id)) {
+      // double check of ChangeSelectedProject(..):
+      // if the user is no admin nor owner of a parent project
+      if (!IsAdmin() && !HiveAdminClient.Instance.CheckOwnershipOfParentProject(selectedProject, UserInformation.Instance.User.Id)) {
+        MessageBox.Show(
+          "Only admins and owners of parent projects are allowed to delete this project.",
+          "HeuristicLab Hive Administrator",
+          MessageBoxButtons.OK,
+          MessageBoxIcon.Error);
+        return;
+      }            
+
+
+      if (Content.Any(x => x.ParentProjectId == selectedProject.Id) 
+          || HiveAdminClient.Instance.ProjectDescendants[selectedProject.Id].Any()) {
         MessageBox.Show(
           "Only empty projects can be deleted.",