Changeset 9363 for branches/OaaS/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

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.Hive.Administrator/3.3/Views/ResourcesView.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.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;

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