Download as
Browse Code »

Commit 060646dda5513746393e4f8bd969df6cdebd9bb4

Authored by Gust
Committed by Sergio Oliveira
1 parent 8e6958e0
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 homepage redirect configuration 

-COLAB_HOME_URL in settings.py sets the homepage redirect, empty to
ignore configuration

Signed-off-by: Gustavo Jaruga Cruz <darksshades@gmail.com>
Showing 2 changed files with 12 additions and 1 deletions   Show diff stats
colab/settings.py
  Diff comments   View file @060646d
@@ -315,3 +315,5 @@ if FEEDZILLA_ENABLED: @@ -315,3 +315,5 @@ if FEEDZILLA_ENABLED:
315 proxied_apps = locals().get('PROXIED_APPS') or {} 315 proxied_apps = locals().get('PROXIED_APPS') 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 +
  319 +COLAB_HOME_URL = ''
318 \ No newline at end of file 320 \ No newline at end of file
@@ -2,6 +2,7 @@ from django.conf.urls import patterns, include, url, static @@ -2,6 +2,7 @@ from django.conf.urls import patterns, include, url, static
2 from django.conf import settings 2 from django.conf import settings
3 from django.views.generic import TemplateView 3 from django.views.generic import TemplateView
4 from django.contrib import admin 4 from django.contrib import admin
  5 +from django.views.generic import RedirectView
5 6
6 from .accounts.models import User 7 from .accounts.models import User
7 from .search.forms import ColabSearchForm 8 from .search.forms import ColabSearchForm
@@ -11,7 +12,6 @@ from .super_archives.models import Message @@ -11,7 +12,6 @@ from .super_archives.models import Message
11 admin.autodiscover() 12 admin.autodiscover()
12 13
13 urlpatterns = patterns('', 14 urlpatterns = patterns('',
14 - url(r'^$', 'colab.home.views.index', name='home'),  
15 url(r'^robots.txt$', 'colab.home.views.robots', name='robots'), 15 url(r'^robots.txt$', 'colab.home.views.robots', name='robots'),
16 16
17 url(r'^open-data/$', TemplateView.as_view(template_name='open-data.html'), 17 url(r'^open-data/$', TemplateView.as_view(template_name='open-data.html'),
@@ -45,3 +45,12 @@ if settings.DEBUG: @@ -45,3 +45,12 @@ if settings.DEBUG:
45 settings.MEDIA_URL, 45 settings.MEDIA_URL,
46 document_root=settings.MEDIA_ROOT 46 document_root=settings.MEDIA_ROOT
47 ) 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 + )
48 \ No newline at end of file 57 \ No newline at end of file