Revision 7f16b9b1 snf-cyclades-app/synnefo/ui/views.py

b/snf-cyclades-app/synnefo/ui/views.py
46 46
from synnefo_branding import settings as snf_settings
47 47

  
48 48
from synnefo.util.version import get_component_version
49
from synnefo.lib import join_urls
49 50

  
50 51
from snf_django.lib.astakos import get_user
51 52

  
......
154 155
            'UI_NETWORK_ALLOW_MULTIPLE_DESTROY', False)
155 156
AUTOMATIC_NETWORK_RANGE_FORMAT = getattr(settings,
156 157
                                         'UI_AUTOMATIC_NETWORK_RANGE_FORMAT',
157
                                         "192.168.%d.0/24").replace("%d", "{0}")
158
                                         "192.168.%d.0/24").replace("%d",
159
                                                                    "{0}")
158 160
GROUP_PUBLIC_NETWORKS = getattr(settings, 'UI_GROUP_PUBLIC_NETWORKS', True)
159 161
GROUPED_PUBLIC_NETWORK_NAME = \
160 162
    getattr(settings, 'UI_GROUPED_PUBLIC_NETWORK_NAME', 'Internet')
161 163

  
162
USER_CATALOG_URL = getattr(settings, 'UI_USER_CATALOG_URL', '/astakos/api/user_catalogs')
163
FEEDBACK_POST_URL = getattr(settings, 'UI_FEEDBACK_POST_URL', '/astakos/api/feedback')
164
ASTAKOS_BASE_URL = '/'
165
ASTAKOS_API_URL = join_urls(ASTAKOS_BASE_URL, 'astakos/api')
166

  
167
USER_CATALOG_URL = getattr(settings, 'UI_USER_CATALOG_URL',
168
                           join_urls(ASTAKOS_API_URL, 'user_catalogs'))
169
FEEDBACK_POST_URL = getattr(settings, 'UI_FEEDBACK_POST_URL',
170
                            join_urls(ASTAKOS_API_URL, 'feedback'))
171
ACCOUNTS_API_URL = getattr(settings, 'UI_ACCOUNTS_API_URL', ASTAKOS_API_URL)
164 172
TRANSLATE_UUIDS = not getattr(settings, 'TRANSLATE_UUIDS', False)
165
ACCOUNTS_API_URL = getattr(settings, 'UI_ACCOUNTS_API_URL', '/astakos/api')
166 173

  
167 174

  
168 175
def template(name, request, context):

Also available in: Unified diff