Changeset 9063 for trunk/sources

Timestamp:

12/17/12 10:48:26 (12 years ago)

Author:

ascheibe

Message:

#1950 fixed some errors that occurred when the user name was not set correctly

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Access.Administration/3.3/MenuItems/UserAdministrationMenuItem.cs (modified) (1 diff)
• HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Access.Administration/3.3/MenuItems/UserAdministrationMenuItem.cs

@@ -35 +35 @@
     }
     public override void Execute() {
+      if (!UserInformation.Instance.UserExists) {
+        MessageBox.Show("Couldn't fetch user information from the server." + Environment.NewLine + "Please verify that you have an existing user and that your user name and password is correct. ", "HeuristicLab Access Service", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        return;
+      }
       if (UserInformation.Instance.User.Roles.Where(x => x.Name == UserInformation.AdministratorRoleName).Count() > 0) {
         using (UserAdministrationDialog dialog = new UserAdministrationDialog()) {

trunk/sources/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserView.cs

@@ -75 +75 @@
       base.Content_Refreshed(sender, e);
 
-      lightweightUserView.Content = new ItemList<UserGroupBase>(Content.UsersAndGroups.Where(x => selectedUsers.Contains(x.Id)));
-      if (lightweightUserView.Content != null) OnStorableStateChanged();
+      if (Content.UsersAndGroups != null) {
+        lightweightUserView.Content = new ItemList<UserGroupBase>(Content.UsersAndGroups.Where(x => selectedUsers.Contains(x.Id)));
+        if (lightweightUserView.Content != null) OnStorableStateChanged();
+      }
     }
 

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

@@ -437 +437 @@
 
       try {
+        if (!Access.UserInformation.Instance.UserExists) {
+          //do a refresh just in case that the user has changed his usr and pwd in between
+          Access.UserInformation.Instance.Refresh();
+        }
         HiveAdminClient.Instance.Refresh();
         Content = HiveAdminClient.Instance.Resources;