Download as
Browse Code »

Commit a3acbdfde9a453d3c46c1ca931b88fab6e1d3e9c

Authored by Gust
1 parent 5b55538c
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, 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_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Adding database only if trac is on 

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
Showing 2 changed files with 2 additions and 3 deletions   Show diff stats
src/colab/custom_settings.py
  Diff comments   View file @a3acbdf
... ... @@ -313,9 +313,6 @@ DPASTE_DEFAULT_GIST_NAME = &#39;colab_paste&#39;
313 313 ### Trac
314 314 TRAC_ENABLED = False
315 315  
316   -from trac_settings import *
317   -DATABASES['trac'] = TRAC_DATABASE
318   -
319 316 try:
320 317 from local_settings import *
321 318 except ImportError:
... ...
src/colab/local_settings-dev.py
  Diff comments   View file @a3acbdf
... ... @@ -31,6 +31,8 @@ DATABASES[&#39;default&#39;][&#39;HOST&#39;] = &#39;localhost&#39;
31 31 TRAC_ENABLED = False
32 32  
33 33 if TRAC_ENABLED:
  34 + from trac_settings import *
  35 + DATABASES['trac'] = TRAC_DATABASE
34 36 DATABASES['trac']['PASSWORD'] = 'colab'
35 37 DATABASES['trac']['HOST'] = 'localhost'
36 38  
... ...