Changeset 8071 for trunk/sources/HeuristicLab.Clients.Hive.Administrator

Timestamp:

06/20/12 20:11:13 (12 years ago)

Author:

jkarder

Message:

#1860:

• removed AuthorizesForResourceAdministration method
• transfered permission checking to the client

Location:

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views

Files:

• ResourcesView.cs (modified) (1 diff)
• SlaveView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -232 +232 @@
           && resource.Name != UngroupedGroupName
           && resource.Id != Guid.Empty
-          && HiveServiceLocator.Instance.CallHiveService<bool>(service => { return service.AuthorizesForResourceAdministration(resource.Id); });
+          && UserInformation.Instance.UserExists
+          && (resource.OwnerUserId == UserInformation.Instance.User.Id || HiveRoles.CheckAdminUserPermissions());
     }
 

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.cs

@@ -69 +69 @@
           ShowSlaveUI(true);
           Slave ct = (Slave)Content;
-          bool authorized = HiveServiceLocator.Instance.CallHiveService<bool>(service => service.AuthorizesForResourceAdministration(ct.Id));
+          bool authorized = UserInformation.Instance.UserExists && (ct.OwnerUserId == UserInformation.Instance.User.Id || HiveRoles.CheckAdminUserPermissions());
           txtName.Text = ct.Name;
           txtHbIntervall.Text = ct.HbInterval.ToString();