File suse-patches.diff of Package openstack-dashboard

diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html b/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html
index aacb429..34dbe8f 100644
--- a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html
+++ b/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html
@@ -93,5 +93,4 @@
         <li><em>{% trans "No volumes attached." %}</em></li>
       </ul>
     {% endif %}
-  </dl>
 </div>
diff --git a/horizon/dashboards/syspanel/users/tables.py b/horizon/dashboards/syspanel/users/tables.py
index fe51a3a..6e1b244 100644
--- a/horizon/dashboards/syspanel/users/tables.py
+++ b/horizon/dashboards/syspanel/users/tables.py
@@ -109,7 +109,7 @@ class UserFilterAction(tables.FilterAction):
 
         def comp(user):
             if any([q in (user.name or "").lower(),
-                    q in (user.email or "").lower()]):
+                    q in ((hasattr(user, 'email') and user.email) or "").lower()]):
                 return True
             return False
 
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
index 5153759..a2d95c6 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -94,7 +94,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'django_nose',
+    #'django_nose',
     'horizon',
     'horizon.dashboards.nova',
     'horizon.dashboards.syspanel',
diff --git a/openstack_dashboard/wsgi/django.wsgi b/openstack_dashboard/wsgi/django.wsgi
index 1e92a4d..1166eaa 100644
--- a/openstack_dashboard/wsgi/django.wsgi
+++ b/openstack_dashboard/wsgi/django.wsgi
@@ -4,6 +4,9 @@ import sys
 import django.core.handlers.wsgi
 from django.conf import settings
 
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../../")))
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../")))
+
 # Add this file path to sys.path in order to import settings
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '../..'))
 os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_dashboard.settings'
diff --git a/tools/pip-requires b/tools/pip-requires
index 498cc1b..b35573c 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -7,7 +7,7 @@ django-nose
 # Glance Requirements
 PasteDeploy
 eventlet
-kombu
+#kombu # required?
 paste
 pycrypto==2.3
 routes