Download as
Browse Code »

Commit e802067349779fda248548d803f71ab2749428bb

Authored by Sergio Oliveira
2 parents c1ddade6 1b577622
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

Merge branch 'colab_home_redirect' into 'master' 

Colab home redirect

Settings COLAB_HOME_URL indicates the homepage redirect page, empty if default homepage.
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
colab/home/views.py
  Diff comments   View file @e802067
... ... @@ -13,8 +13,8 @@ from colab.search.utils import trans
13 13 from colab.super_archives.models import Thread
14 14  
15 15  
16   -def index(request):
17   - """Index page view"""
  16 +def dashboard(request):
  17 + """Dashboard page"""
18 18  
19 19  
20 20 latest_threads = Thread.objects.all()[:6]
... ...
colab/urls.py
  Diff comments   View file @e802067
... ... @@ -13,7 +13,7 @@ admin.autodiscover()
13 13  
14 14 urlpatterns = patterns('',
15 15 url(r'^robots.txt$', 'colab.home.views.robots', name='robots'),
16   - url(r'^dashboard$', 'colab.home.views.index', name='dashboard'),
  16 + url(r'^dashboard$', 'colab.home.views.dashboard', name='dashboard'),
17 17 url(r'^$', RedirectView.as_view(url=settings.COLAB_HOME_URL), name='home'),
18 18  
19 19 url(r'^open-data/$', TemplateView.as_view(template_name='open-data.html'),
... ... @@ -46,4 +46,4 @@ if settings.DEBUG:
46 46 urlpatterns += static.static(
47 47 settings.MEDIA_URL,
48 48 document_root=settings.MEDIA_ROOT
49   - )
50 49 \ No newline at end of file
  50 + )
... ...