Download as
Browse Code »

Commit 8b9261cb86e8021ace62b14e45ca87e4e651f6f6

Authored by Sergio Oliveira
1 parent 0488c377
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

Setting app_label in views to allow get configuration

Showing 5 changed files with 13 additions and 4 deletions   Show diff stats
colab/proxy/gitlab/views.py
  Diff comments   View file @8b9261c
... ... @@ -5,5 +5,5 @@ from ..utils.views import ColabProxyView
5 5  
6 6  
7 7 class GitlabProxyView(ColabProxyView):
8   - upstream = settings.PROXIED_APPS['gitlab']['upstream']
  8 + app_label = 'gitlab'
9 9 diazo_theme_template = 'proxy/gitlab.html'
... ...
colab/proxy/jenkins/views.py
  Diff comments   View file @8b9261c
... ... @@ -5,4 +5,4 @@ from ..utils.views import ColabProxyView
5 5  
6 6  
7 7 class JenkinsProxyView(ColabProxyView):
8   - upstream = settings.PROXIED_APPS['jenkins']['upstream']
  8 + app_label = 'jenkins'
... ...
colab/proxy/redmine/views.py
  Diff comments   View file @8b9261c
... ... @@ -5,5 +5,5 @@ from ..utils.views import ColabProxyView
5 5  
6 6  
7 7 class RedmineProxyView(ColabProxyView):
8   - upstream = settings.PROXIED_APPS['redmine']['upstream']
  8 + app_label = 'redmine'
9 9 diazo_theme_template = 'proxy/redmine.html'
... ...
colab/proxy/trac/views.py
  Diff comments   View file @8b9261c
... ... @@ -8,7 +8,7 @@ from .models import Wiki, Ticket, Revision
8 8  
9 9  
10 10 class TracProxyView(HitCounterViewMixin, ColabProxyView):
11   - upstream = settings.PROXIED_APPS['trac']['upstream']
  11 + app_label = 'trac'
12 12 diazo_theme_template = 'proxy/trac.html'
13 13  
14 14 def get_object(self):
... ...
colab/proxy/utils/views.py
  Diff comments   View file @8b9261c
... ... @@ -8,3 +8,12 @@ class ColabProxyView(ProxyView):
8 8 add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
9 9 diazo_theme_template = 'base.html'
10 10 html5 = True
  11 +
  12 + @property
  13 + def upstream(self):
  14 + proxy_config = settings.PROXIED_APPS.get(self.app_label, {})
  15 + return proxy_config.get('upstream')
  16 +
  17 + @property
  18 + def app_label(self):
  19 + raise NotImplementedError('app_label attribute must be set')
... ...