Revision edb3e8ef snf-pithos-webclient/pithos_webclient/views.py
b/snf-pithos-webclient/pithos_webclient/views.py | ||
---|---|---|
31 | 31 |
# interpreted as representing official policies, either expressed |
32 | 32 |
# or implied, of GRNET S.A. |
33 | 33 |
|
34 |
import json |
|
35 |
import copy |
|
36 |
|
|
34 | 37 |
from django.views.generic.simple import direct_to_template |
38 |
from django.conf import settings as django_settings |
|
35 | 39 |
|
36 | 40 |
from pithos_webclient import settings |
37 |
from pithos_webclient.version import __version__ |
|
38 |
|
|
39 |
from django.conf import settings as django_settings |
|
41 |
from pithos_webclient.version import __version__ |
|
40 | 42 |
|
41 | 43 |
from synnefo_branding.utils import get_branding_dict |
42 | 44 |
|
43 |
MEDIA_URL = getattr(settings, "PITHOS_WEB_CLIENT_MEDIA_URL", \ |
|
44 |
getattr(django_settings, "MEDIA_URL", "/static/")) |
|
45 |
|
|
46 |
MEDIA_URL = getattr(settings, "PITHOS_WEB_CLIENT_MEDIA_URL", |
|
47 |
getattr(django_settings, "MEDIA_URL", "/static/")) |
|
45 | 48 |
|
46 | 49 |
URLS_CONFIG = { |
47 | 50 |
'STORAGE_API_URL': settings.PITHOS_URL.rstrip('/') + '/', |
... | ... | |
53 | 56 |
|
54 | 57 |
def index(request): |
55 | 58 |
branding_settings = get_branding_dict("") |
59 |
urls_config = copy.deepcopy(URLS_CONFIG) |
|
60 |
|
|
61 |
for key, value in urls_config.iteritems(): |
|
62 |
urls_config[key] = json.dumps(value) |
|
63 |
|
|
64 |
for key, value in branding_settings.iteritems(): |
|
65 |
branding_settings[key] = json.dumps(value) |
|
66 |
|
|
56 | 67 |
return direct_to_template(request, 'pithos_webclient/index.html', { |
57 | 68 |
'settings': settings, |
58 | 69 |
'MEDIA_URL': MEDIA_URL, |
Also available in: Unified diff