X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fdashboard%2Fviews%2Fhome.py;h=3084c0eca061b0f84da2aefa973ab68a47255188;hb=149befce1a2f20730d6cce5f0b131e1cfc04cd24;hp=0d9ff74dd5545d8ba83271c66a82cd144f8a2aca;hpb=d39b34a4e7f3fc6e6c9c1b48d6b734a2095e924e;p=plstackapi.git

diff --git a/planetstack/core/dashboard/views/home.py b/planetstack/core/dashboard/views/home.py
index 0d9ff74..3084c0e 100644
--- a/planetstack/core/dashboard/views/home.py
+++ b/planetstack/core/dashboard/views/home.py
@@ -75,18 +75,26 @@ class DashboardDynamicView(TemplateView):
             dashboards.append(customize[0])
 
         for i,view in enumerate(dashboards):
+            # don't display disabled dashboards
+            if (not view.enabled):
+                continue
             body = body + '<li><a href="#dashtab-%d">%s</a></li>\n' % (i, view.name)
 
         body = body + "</ul>\n"
 
         for i,view in enumerate(dashboards):
+            # don't display disabled dashboards
+            if (not view.enabled):
+                continue
+
             url = view.url
             body = body + '<div id="dashtab-%d">\n' % i
             if (view.controllers.all().count()>0):
-                body = body + '<select id="dashselect-%d">' % i;
+                body = body + 'Controller: <select id="dashselect-%d">' % i;
+                body = body + '<option value="None">(select a controller)</option>';
                 for j,controllerdashboard in enumerate(view.controllerdashboardviews.all()):
                     body = body + '<option value="%d">%s</option>' % (j, controllerdashboard.controller.name)
-                body = body + '</select>'
+                body = body + '</select><hr>'
 
                 for j,controllerdashboard in enumerate(view.controllerdashboardviews.all()):
                     body = body + '<script type="text/template" id="dashtemplate-%d-%d">\n%s\n</script>\n' % (i,j, self.embedDashboard(controllerdashboard.url));
@@ -96,11 +104,15 @@ class DashboardDynamicView(TemplateView):
                 body = body + """<script>
                                  $("#dashselect-%d").change(function() {
                                      v=$("#dashselect-%d").val();
+                                     if (v=="None") {
+                                         $("#dashcontent-%d").html("");
+                                         return;
+                                     }
                                      $("#dashcontent-%d").html( $("#dashtemplate-%d-" + v).html() );
                                  });
-                                 $("#dashcontent-%d").html( $("#dashtemplate-%d-0").html() );
+                                 //$("#dashcontent-%d").html( $("#dashtemplate-%d-0").html() );
                                  </script>
-                              """ % (i,i,i,i,i,i);
+                              """ % (i,i,i,i,i,i,i);
             else:
                 body = body + self.embedDashboard(url)
             body = body + '</div>\n'