From fed29ee138c64e507b423e92de998e7dbb0a747d Mon Sep 17 00:00:00 2001
From: lawrancejing <lawrancejing@gmail.com>
Date: Mon, 2 Feb 2015 21:00:41 +0800
Subject: [PATCH] Clean unused code for `supports_tenants`

It seems that the `supports_tenants` attr is unused now,
the patch clean up some code related to `supports_tenants`
so that the code can be more readable for devs:)

Closes-Bug: 1417841
Change-Id: Ia3def66b34bf91a4a4e2d7bcb61c5f3be1d16abb
---
 doc/source/quickstart.rst                     |  1 -
 horizon/base.py                               |  8 ---
 horizon/templates/horizon/_accordion_nav.html | 62 +++++++++----------
 .../dashboards/project/dashboard.py           |  1 -
 4 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/doc/source/quickstart.rst b/doc/source/quickstart.rst
index 674fd03796..366fe1b690 100644
--- a/doc/source/quickstart.rst
+++ b/doc/source/quickstart.rst
@@ -243,7 +243,6 @@ process::
         # ObjectStorePanels
         panels = (BasePanels, NetworkPanels, ObjectStorePanels)
         default_panel = 'overview'
-        supports_tenants = True
         ...
 
     horizon.register(Project)
diff --git a/horizon/base.py b/horizon/base.py
index 3bf7a05a28..ee0bf2d09f 100644
--- a/horizon/base.py
+++ b/horizon/base.py
@@ -412,13 +412,6 @@ class Dashboard(Registry, HorizonComponent):
         to control whether or not this dashboard should appear in
         automatically-generated navigation. Default: ``True``.
 
-    .. attribute:: supports_tenants
-
-        Optional boolean that indicates whether or not this dashboard includes
-        support for projects/tenants. If set to ``True`` this dashboard's
-        navigation will include a UI element that allows the user to select
-        project/tenant. Default: ``False``.
-
     .. attribute:: public
 
         Boolean value to determine whether this dashboard can be viewed
@@ -432,7 +425,6 @@ class Dashboard(Registry, HorizonComponent):
     panels = []
     default_panel = None
     nav = True
-    supports_tenants = False
     public = False
 
     def __repr__(self):
diff --git a/horizon/templates/horizon/_accordion_nav.html b/horizon/templates/horizon/_accordion_nav.html
index 5d21bc1476..a3a692a3c9 100644
--- a/horizon/templates/horizon/_accordion_nav.html
+++ b/horizon/templates/horizon/_accordion_nav.html
@@ -4,39 +4,37 @@
 <dl class="nav_accordion">
 {% for dashboard, panel_info in components %}
   {% if user|has_permissions:dashboard %}
-    {% if dashboard.supports_tenants and request.user.authorized_tenants or not dashboard.supports_tenants %}
-      <dt {% if current.slug == dashboard.slug %}class="active"{% endif %}>
-        {{ dashboard.name }}
-        <span class="glyphicon pull-right"></span>
-      </dt>
-      {% if current.slug == dashboard.slug %}
-      <dd>
-      {% else %}
-      <dd style="display:none;">
-      {% endif %}
-      {% for heading, panels in panel_info.iteritems %}
-        {% with panels|has_permissions_on_list:user as filtered_panels %}
-        {% if filtered_panels %}
-          {% if heading %}
-          <div>
-            <h4>
-              {{ heading }}
-              <span class="glyphicon pull-right"></span>
-            </h4>
-          {% endif %}
-          <ul>
-          {% for panel in filtered_panels %}
-            <li><a href="{{ panel.get_absolute_url }}" {% if current.slug == dashboard.slug and current_panel == panel.slug %}class="active"{% endif %} tabindex="{{ forloop.counter }}" >{{ panel.name }}</a></li>
-          {% endfor %}
-          </ul>
-          {% if heading %}
-            </div>
-          {% endif %}
-        {% endif %}
-        {% endwith %}
-      {% endfor %}
-      </dd>
+    <dt {% if current.slug == dashboard.slug %}class="active"{% endif %}>
+      {{ dashboard.name }}
+      <span class="glyphicon pull-right"></span>
+    </dt>
+    {% if current.slug == dashboard.slug %}
+    <dd>
+    {% else %}
+    <dd style="display:none;">
     {% endif %}
+    {% for heading, panels in panel_info.iteritems %}
+      {% with panels|has_permissions_on_list:user as filtered_panels %}
+      {% if filtered_panels %}
+        {% if heading %}
+        <div>
+          <h4>
+            {{ heading }}
+            <span class="glyphicon pull-right"></span>
+          </h4>
+        {% endif %}
+        <ul>
+        {% for panel in filtered_panels %}
+          <li><a href="{{ panel.get_absolute_url }}" {% if current.slug == dashboard.slug and current_panel == panel.slug %}class="active"{% endif %} tabindex="{{ forloop.counter }}" >{{ panel.name }}</a></li>
+        {% endfor %}
+        </ul>
+        {% if heading %}
+          </div>
+        {% endif %}
+      {% endif %}
+      {% endwith %}
+    {% endfor %}
+    </dd>
   {% endif %}
 {% endfor %}
 </dl>
diff --git a/openstack_dashboard/dashboards/project/dashboard.py b/openstack_dashboard/dashboards/project/dashboard.py
index f38ac04809..750ce56680 100644
--- a/openstack_dashboard/dashboards/project/dashboard.py
+++ b/openstack_dashboard/dashboards/project/dashboard.py
@@ -83,7 +83,6 @@ class Project(horizon.Dashboard):
         DatabasePanels,
         DataProcessingPanels,)
     default_panel = 'overview'
-    supports_tenants = True
 
 
 horizon.register(Project)