Download as
Browse Code »

Commit 7311c66eefc842cdb41468a9911b3b36976d3047

Authored by Carlos Coêlho
1 parent 02f3137a
Exists in master and in 32 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Made it load custom static/templates first 

Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Signed-off-by: Gust <darksshades@hotmail.com>
Showing 1 changed file with 12 additions and 12 deletions   Show diff stats
colab/settings.py
  Diff comments   View file @7311c66
... ... @@ -222,14 +222,6 @@ AUTHENTICATION_BACKENDS = (
222 222 'colab.accounts.auth.ColabBrowserIDBackend',
223 223 )
224 224  
225   -STATICFILES_DIRS = (
226   - os.path.join(BASE_DIR, 'static'),
227   -)
228   -
229   -TEMPLATE_DIRS = (
230   - os.path.join(BASE_DIR, 'templates'),
231   -)
232   -
233 225 LOCALE_PATHS = (
234 226 os.path.join(BASE_DIR, 'locale'),
235 227 )
... ... @@ -317,8 +309,16 @@ for app_name, app in COLAB_APPS.items():
317 309 if context_processor not in TEMPLATE_CONTEXT_PROCESSORS:
318 310 TEMPLATE_CONTEXT_PROCESSORS += (context_processor,)
319 311  
320   -colab_templates = locals().get('COLAB_TEMPLATES') or {}
321   -colab_statics = locals().get('COLAB_STATICS') or {}
  312 +colab_templates = locals().get('COLAB_TEMPLATES') or ()
  313 +colab_statics = locals().get('COLAB_STATICS') or []
322 314  
323   -TEMPLATE_DIRS += tuple(colab_templates)
324   -STATICFILES_DIRS += tuple(colab_statics)
  315 +TEMPLATE_DIRS = tuple(colab_templates)
  316 +STATICFILES_DIRS = list(colab_statics)
  317 +
  318 +STATICFILES_DIRS += [
  319 + os.path.join(BASE_DIR, 'static'),
  320 +]
  321 +
  322 +TEMPLATE_DIRS += (
  323 + os.path.join(BASE_DIR, 'templates'),
  324 +)
... ...