Download as
Browse Code »

Commit c6f6cddd5ca0b6a7e1863b23ef70caf074e31b9d

Authored by Gust
Committed by Sergio Oliveira
1 parent 060646dd
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

Add default home to dashboard 

-Sets colab old home as Dashboard
-Default setting of home to dashboard

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Showing 2 changed files with 3 additions and 10 deletions   Show diff stats
colab/settings.py
  Diff comments   View file @c6f6cdd
@@ -316,4 +316,4 @@ proxied_apps = locals().get(&#39;PROXIED_APPS&#39;) or {} @@ -316,4 +316,4 @@ proxied_apps = locals().get(&#39;PROXIED_APPS&#39;) or {}
316 for app_label in proxied_apps.keys(): 316 for app_label in proxied_apps.keys():
317 INSTALLED_APPS += ('colab.proxy.{}'.format(app_label),) 317 INSTALLED_APPS += ('colab.proxy.{}'.format(app_label),)
318 318
319 -COLAB_HOME_URL = ''  
320 \ No newline at end of file 319 \ No newline at end of file
  320 +COLAB_HOME_URL = '/dashboard'
321 \ No newline at end of file 321 \ No newline at end of file
@@ -13,6 +13,8 @@ admin.autodiscover() @@ -13,6 +13,8 @@ admin.autodiscover()
13 13
14 urlpatterns = patterns('', 14 urlpatterns = patterns('',
15 url(r'^robots.txt$', 'colab.home.views.robots', name='robots'), 15 url(r'^robots.txt$', 'colab.home.views.robots', name='robots'),
  16 + url(r'^dashboard$', 'colab.home.views.index', name='dashboard'),
  17 + url(r'^$', RedirectView.as_view(url=settings.COLAB_HOME_URL), name='home'),
16 18
17 url(r'^open-data/$', TemplateView.as_view(template_name='open-data.html'), 19 url(r'^open-data/$', TemplateView.as_view(template_name='open-data.html'),
18 name='opendata'), 20 name='opendata'),
@@ -44,13 +46,4 @@ if settings.DEBUG: @@ -44,13 +46,4 @@ if settings.DEBUG:
44 urlpatterns += static.static( 46 urlpatterns += static.static(
45 settings.MEDIA_URL, 47 settings.MEDIA_URL,
46 document_root=settings.MEDIA_ROOT 48 document_root=settings.MEDIA_ROOT
47 - )  
48 -  
49 -if settings.COLAB_HOME_URL:  
50 - urlpatterns += patterns('',  
51 - url(r'^$', RedirectView.as_view(url=settings.COLAB_HOME_URL), name='home'),  
52 - )  
53 -else:  
54 - urlpatterns += patterns('',  
55 - url(r'^$', 'colab.home.views.index', name='home'),  
56 ) 49 )
57 \ No newline at end of file 50 \ No newline at end of file