diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-11 04:35:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-11 04:35:16 +0000 |
| commit | b45fb0426432d5b4eb2852055dc77c4a644f5347 (patch) | |
| tree | 7883e755a54dca8c46aa6c4f58e122d65a7bac68 | |
| parent | 6d3241bb19c08b236df89cba06137666d9c1d8db (diff) | |
| parent | dca415d6d834825fb59fd04338aac21429d4f0e5 (diff) | |
| download | horizon-b45fb0426432d5b4eb2852055dc77c4a644f5347.tar.gz | |
Merge "respect webroot setting in containers table" into stable/kilo
| -rw-r--r-- | openstack_dashboard/dashboards/project/containers/tables.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openstack_dashboard/dashboards/project/containers/tables.py b/openstack_dashboard/dashboards/project/containers/tables.py index f58da7139..637ebf3e8 100644 --- a/openstack_dashboard/dashboards/project/containers/tables.py +++ b/openstack_dashboard/dashboards/project/containers/tables.py @@ -13,6 +13,7 @@ # under the License. import logging +from django.conf import settings from django import shortcuts from django import template from django.template import defaultfilters as filters @@ -32,7 +33,8 @@ from openstack_dashboard.dashboards.project.containers import utils LOG = logging.getLogger(__name__) -LOADING_IMAGE = '<img src="/static/dashboard/img/loading.gif" />' +static_url = getattr(settings, 'STATIC_URL', '/static/') +LOADING_IMAGE = '<img src="%s/dashboard/img/loading.gif" />' % static_url class ViewContainer(tables.LinkAction): |