Changeset 7928

Timestamp:

05/29/12 18:38:19 (12 years ago)

Author:

ascheibe

Message:

#1711

• disabled resource view of Hive Administrator as default view
• fixed OnContentChanged

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs (modified) (1 diff)

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

@@ -35 +35 @@
 namespace HeuristicLab.Clients.Hive.Administrator.Views {
   [View("Resources View")]
-  [Content(typeof(IItemList<Resource>), IsDefaultView = true)]
+  [Content(typeof(IItemList<Resource>), false)]
   public partial class ResourcesView : ItemView, IDisposable {
     public new IItemList<Resource> Content {

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs

@@ -95 +95 @@
 
     protected override void OnContentChanged() {
+      base.OnContentChanged();
+
       if (Content != null) {
-        base.OnContentChanged();
         selectedResources = new HashSet<Resource>(Content.Where(x => selectedResources.Any(y => x.Id == y.Id)));
-      }
-      UpdateMainTree();
-      ExtractStatistics();
+        UpdateMainTree();
+        ExtractStatistics();
+      } else {
+        mainTreeNodes.Clear();
+        UpdateFilteredTree();
+      }
     }