Changeset 9363 for branches/OaaS/HeuristicLab.Clients.Access.Administration/3.3/MenuItems

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Access.Administration/3.3 (modified) (1 prop)
• HeuristicLab.Clients.Access.Administration/3.3/MenuItems/UserAdministrationMenuItem.cs (modified) (1 diff)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Clients.Access.Administration/3.3

@@ -1 +1 @@
 Plugin.cs
 obj
+*.user

@@ -1 +1 @@
 Plugin.cs
 obj
+*.user

branches/OaaS/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()) {

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -1 +1 @@
 Plugin.cs
 obj
+*.user