Changeset 17065 for stable/HeuristicLab.Clients.Hive.Administrator/3.3
- Timestamp:
- 07/04/19 14:49:59 (5 years ago)
- Location:
- stable
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
-
stable/HeuristicLab.Clients.Hive.Administrator
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Clients.Hive.Administrator merged: 16513
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.cs
r17063 r17065 36 36 InitializeComponent(); 37 37 } 38 39 protected override void OnContentChanged() {40 base.OnContentChanged();41 if (Content != null) {42 projectsView.Content = Content.Projects;43 resourcesView.Content = Content.Resources;44 } else {45 projectsView.Content = null;46 resourcesView.Content = null;47 }48 }49 38 } 50 39 } -
stable/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs
r17063 r17065 96 96 97 97 ownerComboBox.SelectedIndexChanged -= ownerComboBox_SelectedIndexChanged; 98 var users = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>(); 99 if (!Content.ParentProjectId.HasValue) users = users.Where(x => x.Roles.Select(y => y.Name).Contains(HiveRoles.Administrator)); 100 var projectOwnerId = Content.OwnerUserId; 101 ownerComboBox.DataSource = users.OrderBy(x => x.UserName).ToList(); 102 ownerComboBox.SelectedItem = users.FirstOrDefault(x => x.Id == projectOwnerId); 98 if (AccessClient.Instance.UsersAndGroups != null) { 99 var users = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>(); 100 if (!Content.ParentProjectId.HasValue) users = users.Where(x => x.Roles.Select(y => y.Name).Contains(HiveRoles.Administrator)); 101 var projectOwnerId = Content.OwnerUserId; 102 ownerComboBox.DataSource = users.OrderBy(x => x.UserName).ToList(); 103 ownerComboBox.SelectedItem = users.FirstOrDefault(x => x.Id == projectOwnerId); 104 } 103 105 ownerComboBox.SelectedIndexChanged += ownerComboBox_SelectedIndexChanged; 104 106
Note: See TracChangeset
for help on using the changeset viewer.