Changeset 15992 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator

Timestamp:

07/10/18 23:06:00 (6 years ago)

Author:

jzenisek

Message:

#2839: fixed couple of minor issues

• changed tags in resource selector
• added project information in job list and adapted sortation
• fixed hand-down save by withdrawing additional offset-rights (permissions, resources),...

Location:

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

Files:

• ProjectView.cs (modified) (4 diffs)
• ProjectsView.cs (modified) (3 diffs)

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

@@ -82 +82 @@
         nameTextBox.Text = Content.Name;
         descriptionTextBox.Text = Content.Description;
-        ownerComboBox.SelectedItem = AccessClient.Instance.UsersAndGroups.FirstOrDefault(x => x.Id == Content.OwnerUserId);
+
+        ownerComboBox.SelectedIndexChanged -= ownerComboBox_SelectedIndexChanged;
+        var users = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>();
+        if (!Content.ParentProjectId.HasValue) users = users.Where(x => x.Roles.Select(y => y.Name).Contains(HiveRoles.Administrator));
+        ownerComboBox.DataSource = users.ToList();
+        ownerComboBox.SelectedItem = users.FirstOrDefault(x => x.Id == Content.OwnerUserId);
+        ownerComboBox.SelectedIndexChanged += ownerComboBox_SelectedIndexChanged;
+
         createdTextBox.Text = Content.DateCreated.ToString("ddd, dd.MM.yyyy, HH:mm:ss");
         startDateTimePicker.Value = Content.StartDate;
@@ -135 +142 @@
         finallyCallback: () => {
           ownerComboBox.SelectedIndexChanged -= ownerComboBox_SelectedIndexChanged;
-          ownerComboBox.DataSource = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>().ToList();
+          var users = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>();
+          if (Content != null && !Content.ParentProjectId.HasValue) users = users.Where(x => x.Roles.Select(y => y.Name).Contains(HiveRoles.Administrator));
+          ownerComboBox.DataSource = users.ToList();
           ownerComboBox.SelectedIndexChanged += ownerComboBox_SelectedIndexChanged;
         });
@@ -150 +159 @@
         finallyCallback: () => {
           ownerComboBox.SelectedIndexChanged -= ownerComboBox_SelectedIndexChanged;
-          ownerComboBox.DataSource = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>().ToList();
-          ownerComboBox.SelectedItem = AccessClient.Instance.UsersAndGroups.FirstOrDefault(x => x.Id == persistedOwnerUserId);
+          var users = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>();
+          if (Content != null && !Content.ParentProjectId.HasValue) users = users.Where(x => x.Roles.Select(y => y.Name).Contains(HiveRoles.Administrator));
+          ownerComboBox.DataSource = users.ToList();
+          ownerComboBox.SelectedItem = users.FirstOrDefault(x => x.Id == persistedOwnerUserId);
           ownerComboBox.SelectedIndexChanged += ownerComboBox_SelectedIndexChanged;
           refreshButton.Enabled = true;
@@ -203 +214 @@
     private void indefiniteCheckBox_CheckedChanged(object sender, EventArgs e) {
       if (Content == null) return;
-      var newEndDate = indefiniteCheckBox.Checked ? (DateTime?)null : Content.StartDate;
+      var newEndDate = indefiniteCheckBox.Checked ? (DateTime?)null : endDateTimePicker.Value;
       endDateTimePicker.Enabled = !indefiniteCheckBox.Checked;
       if (Content.EndDate != newEndDate) {
         DeregisterContentEvents();
         Content.EndDate = newEndDate;
-        endDateTimePicker.Value = newEndDate.HasValue ? newEndDate.Value : Content.StartDate;
         RegisterContentEvents();
       }

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

@@ -110 +110 @@
       bool enabled = Content != null && !Locked && !ReadOnly;
       refreshButton.Enabled = enabled;
-      addButton.Enabled = enabled;
-      removeButton.Enabled = enabled;
-      saveProjectButton.Enabled = enabled;
+      //addButton.Enabled = enabled;
+      //removeButton.Enabled = enabled;
+      //saveProjectButton.Enabled = enabled;
       projectView.Enabled = enabled;
       projectPermissionsView.Enabled = enabled;
@@ -199 +199 @@
       Guid? parentProjectId = null;
 
+      if(selectedProject == null && !IsAdmin()) {
+        MessageBox.Show(
+          "You are not allowed to add a root project - please select a parent project.",
+          "HeuristicLab Hive Administrator",
+          MessageBoxButtons.OK,
+          MessageBoxIcon.Information);
+        return;
+      }
+      
       if (selectedProject != null && selectedProject.Id == Guid.Empty) {
         MessageBox.Show(
@@ -459 +468 @@
       bool projectIsNew = project != null && project.Id == Guid.Empty;
       bool locked = project == null || projectIsNew;
+
+      // if the project is new, or:
+      // the project does have any descendant projects and
+      // the user is an admin or owner of a parent project
       bool deleteEnabled = project != null && (
         projectIsNew
-        || HiveAdminClient.Instance.CheckOwnershipOfParentProject(project, UserInformation.Instance.User.Id)
-        || !HiveAdminClient.Instance.ProjectDescendants[project.Id].Any());
-
-      addButton.Enabled = !locked;
+        ||  (!HiveAdminClient.Instance.ProjectDescendants[project.Id].Any()
+              && (HiveAdminClient.Instance.CheckOwnershipOfParentProject(project, UserInformation.Instance.User.Id)
+              || IsAdmin())
+            )
+      );
+
+      bool addEnabled = !locked;
+      if (!IsAdmin() && project == null) addEnabled = false;
+
+      bool saveEnabled = project != null;
+      if (!IsAdmin() && !project.ParentProjectId.HasValue) saveEnabled = false;
+
+      addButton.Enabled = addEnabled;
       removeButton.Enabled = deleteEnabled;
+      saveProjectButton.Enabled = saveEnabled;
       projectPermissionsView.Locked = locked;
       projectResourcesView.Locked = locked;