Changeset 947 for trunk

Timestamp:

12/10/08 15:00:52 (16 years ago)

Author:

msteinbi

Message:

Implementation of UserRoleManager (#417)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/ApplicationConstants.cs (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/HiveServerMessages.resx (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/UserRoleManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Contracts/ApplicationConstants.cs

@@ -20 +20 @@
     public static string RESPONSE_USERROLE_GET_ALL_USERGROUPS = "UserRole.AllUserGroupsReturned";
     public static string RESPONSE_USERROLE_ID_MUST_NOT_BE_SET = "UserRole.IdMustNotBeSet";
+    public static string RESPONSE_USERROLE_USERGROUP_ADDED_TO_USERGROUP = "UserRole.UserGroupAddedToUserGroup";
 
     public static string RESPONSE_CLIENT_GET_ALL_CLIENTS = "Client.GetAllClients";
@@ -37 +38 @@
     public static string RESPONSE_COMMUNICATOR_LOGIN_SUCCESS = "Communicator.LoginSuccess";
     public static string RESPONSE_COMMUNICATOR_LOGOUT_CLIENT_NOT_REGISTERED = "Communicator.LogoutClientNotRegistered";
-    public static string RESPONSE_COMMUNICATOR_LOGOUT_SUCCESS = "Logout.Success";
+    public static string RESPONSE_COMMUNICATOR_LOGOUT_SUCCESS = "Communicator.LogoutSuccess";
     public static string RESPONSE_COMMUNICATOR_NO_JOBS_LEFT = "Communicator.NoJobsLeft";
 

trunk/sources/HeuristicLab.Hive.Contracts/HiveServerMessages.resx

@@ -142 +142 @@
     <value>You where logged out successfully. Good bye</value>
   </data>
-  <data name="Logout.UserAllreadyOnline" xml:space="preserve">
+  <data name="Communicator.LogoutUserAllreadyOnline" xml:space="preserve">
     <value>A User with this GUID is allready logged in</value>
   </data>

trunk/sources/HeuristicLab.Hive.Server.Core/UserRoleManager.cs

@@ -134 +134 @@
       Response response = new Response();
 
+      UserGroup userGroup = userGroupAdapter.GetUserGroupById(groupId);
+      UserGroup userGroupToAdd = userGroupAdapter.GetUserGroupById(groupToAddId);
+
+      if (userGroup == null || userGroupToAdd == null) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_USERGROUP_DOESNT_EXIST;
+        return response;
+      }
+      userGroup.Members.Add(userGroupToAdd);
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_USERGROUP_ADDED_TO_USERGROUP;
+
       return response;
     }