X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fdashboard%2Fviews%2Fhome.py;h=6f57666c161ade5ad264e64fc1d9d5d21b6f7574;hb=d6a61aef42561ea138fcb7b192f3082e018b852b;hp=c0acfdf0995867139337cf4df977bee3149bc6dd;hpb=17ea69b28c8263ec174cbb8b9adbab57d17742b2;p=plstackapi.git

diff --git a/planetstack/core/dashboard/views/home.py b/planetstack/core/dashboard/views/home.py
index c0acfdf..6f57666 100644
--- a/planetstack/core/dashboard/views/home.py
+++ b/planetstack/core/dashboard/views/home.py
@@ -75,32 +75,37 @@ 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;
-                for j,controllerdashboard in enumerate(view.controllerdashboards.all()):
+                for j,controllerdashboard in enumerate(view.controllerdashboardviews.all()):
                     body = body + '<option value="%d">%s</option>' % (j, controllerdashboard.controller.name)
                 body = body + '</select>'
 
-                for j,controllerdashboard in enumerate(view.controllerdashboards.all()):
-                    body = body + '<div id="dashcontent-%d-%d" class="dashcontent-%d">\n' % (i,j,i)
-                    body = body + self.embedDashboard(controllerdashboard.url);
-                    body = body + '</div>\n';
+                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));
+
+                body = body + '<div id="dashcontent-%d" class="dashcontent"></div>\n' % i
 
                 body = body + """<script>
-                                 $("#dashselect-%d").change(function() { console.log("change!");
+                                 $("#dashselect-%d").change(function() {
                                      v=$("#dashselect-%d").val();
-                                     $(".dashcontent-%d").hide();
-                                     $("#dashcontent-%d-" + v).show();
+                                     $("#dashcontent-%d").html( $("#dashtemplate-%d-" + v).html() );
                                  });
-                                 $(".dashcontent-%d").hide();
-                                 $("#dashcontent-%d-0").show();
+                                 $("#dashcontent-%d").html( $("#dashtemplate-%d-0").html() );
                                  </script>
                               """ % (i,i,i,i,i,i);
             else: