Changeset 16187 for trunk

Timestamp:

09/26/18 15:02:09 (6 years ago)

Author:

jzenisek

Message:

#2839

• fixed enabled state of controls bug for initial project selection regarding permission detail views
• fixed problem at resource assignment for root projects

Location:

trunk

Files:

• HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (1 diff)

trunk/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.cs

@@ -45 +45 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
+      this.Locked = true;
       refreshButton.Enabled = Content != null;
     }

trunk/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs

@@ -78 +78 @@
         detailsViewHost.Content = null;
       } else {
-        UpdatePermissionList();
-        detailsViewHost.ActiveView.Locked = true;
-      }
+        UpdatePermissionList();        
+      }
+      SetEnabledStateOfControls();
     }
 
@@ -90 +90 @@
       saveButton.Enabled = enabled;
       treeView.Enabled = enabled;
+
+      if (detailsViewHost != null) {
+        detailsViewHost.Locked = true;
+      }
+
     }
     #endregion

trunk/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -46 +47 @@
       this.itemsListView.FullRowSelect = true;
 
-      this.itemsListView.ListViewItemSorter = new ListViewItemComparer(new int[] { 2, 0 }, new SortOrder[] { SortOrder.Ascending, SortOrder.Ascending });
+      this.itemsListView.ListViewItemSorter = new ListViewItemComparer(new int[] { 2, 0 }, new SortOrder[] { SortOrder.Ascending, SortOrder.Ascending });      
 
       foreach (ColumnHeader c in this.itemsListView.Columns) {
@@ -63 +64 @@
       itemsListView.Sorting = sortOrder;
       itemsListView.Sort();
-      //AdjustListViewColumnSizes();
+      AdjustListViewColumnSizes();
     }
 

trunk/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -1242 +1242 @@
 
           var assignedResources = project.AssignedProjectResources.Select(x => x.ResourceId).ToArray();
-          if (!isParent) resourceIds = assignedResources.ToList();
+          if (!isParent && !isAdmin) resourceIds = assignedResources.ToList();
           var removedAssignments = assignedResources.Except(resourceIds);