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

Timestamp:

08/03/18 13:50:29 (6 years ago)

Author:

jzenisek

Message:

#2839: adapted handling of project start/end boundaries for non-admins

File:

• branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs (modified) (3 diffs)

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

@@ -197 +197 @@
     }
 
-    private void addButton_Click(object sender, EventArgs e) {
-      Guid? parentProjectId = null;
-
-      if(selectedProject == null && !IsAdmin()) {
+    private void addButton_Click(object sender, EventArgs e) {      
+
+      if (selectedProject == null && !IsAdmin()) {
         MessageBox.Show(
           "You are not allowed to add a root project - please select a parent project.",
@@ -218 +217 @@
       }
 
-      if (selectedProject != null) parentProjectId = selectedProject.Id;
       var project = new Project {
         Name = "New Project",
-        OwnerUserId = UserInformation.Instance.User.Id,
-        ParentProjectId = parentProjectId
+        OwnerUserId = UserInformation.Instance.User.Id,        
       };
+      if(selectedProject != null) {
+        project.ParentProjectId = selectedProject.Id;
+        project.EndDate = selectedProject.EndDate;
+      }
 
       SelectedProject = project;
@@ -508 +509 @@
 
       bool addEnabled = !locked;
-      if (!IsAdmin() && project == null) addEnabled = false;
+      if(addEnabled) {
+        var now = DateTime.Now;
+        if (now < project.StartDate || now > project.EndDate) addEnabled = false;
+      }
 
       bool saveEnabled = project != null;