Changeset 16529 for branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive.Administrator

Timestamp:

01/10/19 15:40:44 (6 years ago)

Author:

gkronber

Message:

#2520: merged r16491:16528 from trunk to persistence branch

Location:

branches/2520_PersistenceReintegration

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Administrator (modified) (1 prop)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs (modified) (1 diff)

branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.cs

@@ -36 +36 @@
       InitializeComponent();
     }
-
-    protected override void OnContentChanged() {
-      base.OnContentChanged();
-      if (Content != null) {
-        projectsView.Content = Content.Projects;
-        resourcesView.Content = Content.Resources;
-      } else {
-        projectsView.Content = null;
-        resourcesView.Content = null;
-      }
-    }
   }
 }

branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs

@@ -96 +96 @@
 
         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));
-        var projectOwnerId = Content.OwnerUserId;
-        ownerComboBox.DataSource = users.OrderBy(x => x.UserName).ToList();
-        ownerComboBox.SelectedItem = users.FirstOrDefault(x => x.Id == projectOwnerId);
+        if (AccessClient.Instance.UsersAndGroups != null) {
+          var users = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>();
+          if (!Content.ParentProjectId.HasValue) users = users.Where(x => x.Roles.Select(y => y.Name).Contains(HiveRoles.Administrator));
+          var projectOwnerId = Content.OwnerUserId;
+          ownerComboBox.DataSource = users.OrderBy(x => x.UserName).ToList();
+          ownerComboBox.SelectedItem = users.FirstOrDefault(x => x.Id == projectOwnerId);
+        }
         ownerComboBox.SelectedIndexChanged += ownerComboBox_SelectedIndexChanged;