Changeset 16117 for trunk/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs

Timestamp:

08/30/18 11:32:56 (6 years ago)

Author:

jkarder

Message:

#2839: merged [15377-16116/branches/2839_HiveProjectManagement] into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Administrator (modified) (1 prop)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs (copied) (copied from branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs) (8 diffs)

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

@@ -53 +53 @@
     private readonly Color addedIncludeColor = Color.FromArgb(25, 169, 221, 221); // #a9dddd
     private readonly Color removedIncludeColor = Color.FromArgb(25, 249, 210, 145); // #f9d291
+    private readonly Color projectOwnerColor = Color.DarkRed;
 
     public new Project Content {
@@ -116 +117 @@
       var selectedPermission = (UserGroupBase)e.Node.Tag;
       detailsViewHost.Content = selectedPermission;
+      if (selectedPermission is LightweightUser)
+        detailsViewHost.ViewType = typeof(Access.Views.RefreshableLightweightUserInformationView);
     }
 
     private void treeView_BeforeCheck(object sender, TreeViewCancelEventArgs e) {
       var checkedPermission = (UserGroupBase)e.Node.Tag;
-      if (e.Node.Parent == null || newInheritedPermissions.Contains(checkedPermission) || checkedPermission.Id == Guid.Empty) e.Cancel = true;
+      if (e.Node.Parent == null 
+        || newInheritedPermissions.Contains(checkedPermission) 
+        || checkedPermission.Id == Guid.Empty
+        || Content.OwnerUserId == checkedPermission.Id)
+          e.Cancel = true;
     }
 
@@ -136 +143 @@
     #region Helpers
     private void UpdatePermissionList() {
+      AccessClient.Instance.Refresh();
+
       UpdateUserGroupGenealogy();
       UpdateAssignedPermissions();
@@ -162 +171 @@
     private void UpdateNewAssignedPermissions() {
       for(int i = newAssignedPermissions.Count-1; i >= 0; i--) {
-        if(newAssignedPermissions.Intersect(userGroupAncestors[newAssignedPermissions.ElementAt(i).Id]).Any()) {
+        if(newAssignedPermissions.Intersect(userGroupAncestors[newAssignedPermissions.ElementAt(i).Id]).Any() 
+          && newAssignedPermissions.ElementAt(i).Id != Content.OwnerUserId) {
           newAssignedPermissions.Remove(newAssignedPermissions.ElementAt(i));
         }
@@ -174 +184 @@
         if(userGroupDescendants.ContainsKey(item.Id)) {
           foreach(var descendant in userGroupDescendants[item.Id]) {
-            inheritedPermissions.Add(descendant);
-            newInheritedPermissions.Add(descendant);
+            if(!assignedPermissions.Contains(descendant)) {
+              inheritedPermissions.Add(descendant);
+              newInheritedPermissions.Add(descendant);
+            }
           }
         }
@@ -186 +198 @@
         if(userGroupDescendants.ContainsKey(item.Id)) {
           foreach(var descendant in userGroupDescendants[item.Id]) {
-            newInheritedPermissions.Add(descendant);
+            if(!newAssignedPermissions.Contains(descendant))
+              newInheritedPermissions.Add(descendant);
           }
         }
@@ -216 +229 @@
 
     private static IEnumerable<UserGroupBase> GetGrantedPermissionsForProject(Guid projectId) {
+      if (projectId == Guid.Empty) return Enumerable.Empty<UserGroupBase>();
       var projectPermissions = HiveServiceLocator.Instance.CallHiveService(s => s.GetProjectPermissions(projectId));
       var userIds = new HashSet<Guid>(projectPermissions.Select(x => x.GrantedUserId));
@@ -308 +322 @@
       }
 
+      if(Content != null && ug != null && ug.Id != Guid.Empty 
+        && Content.OwnerUserId == ug.Id) {
+        node.ForeColor = projectOwnerColor;
+      }
+
     }