From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 18 Jun 2015 09:18:55 +0000 (+0200)
Subject: Dashboard: Fixed list of slices not in a project
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=8d1991bdded62a4f68cc93889435b9c28f8565b0

Dashboard: Fixed list of slices not in a project
---

diff --git a/portal/templates/base.html b/portal/templates/base.html
index 8bc204ac..347fe994 100644
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -113,8 +113,6 @@ $(document).ready(function() {
                 if (s.match('^' + escapeRegExp(p))) {
                     slicename = s.replace(p + '.','')
                     items_sl.push( "<li><a href=\"/resources/" + s + "\" title='Add resources to slice "+slicename+"'><img src='/static/img/icon_slices_small.png' style='width: 12px;'>  " + slicename + "</a></li>" );
-                }else if(s.split('.').length < 4){
-                     slices_no_project.push( "<li><a href=\"/resources/" + s + "\" title='Add resources to slice "+s+"'><img src='/static/img/icon_slices_small.png' style='width: 12px;'>  " + s + "</a></li>" );
                 }
             });
             el = "<li><a href=\"/portal/project/" + p + "\" title='Manage project "+p+"' >" + p + "</a>";
@@ -125,11 +123,12 @@ $(document).ready(function() {
             items.push(el);
             items_sl = [];
         });
-        if (projects.length == 0){
-            $.each( slices, function(y, s) {
+
+        $.each( slices, function(y, s) {
+            if(s.split('.').length < 4){
                 slices_no_project.push( "<li><a href=\"/resources/" + s + "\" title='Add resources to slice "+s+"'><img src='/static/img/icon_slices_small.png' style='width: 12px;'>  " + s + "</a></li>" );
-            });
-        }
+            }
+        });
         if (slices_no_project.length > 0) {
             elm = '<li>other slices <span class="glyphicon glyphicon-info-sign" title="these are <b>legacy slices</b> from now on, slices must be created within a project">&nbsp;</span>';
             elm += "<ul>" + slices_no_project.join( "" ) + "</ul>";