Download as
Browse Code »

Commit d9c5a6a6c7c7834e14c9b20740bdd7649f807b0c

Authored by Alexandre Barbosa
1 parent 0df9cd6e
Exists in master and in 34 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_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Rename proxied_apps variable to colab_apps 

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Showing 3 changed files with 7 additions and 8 deletions   Show diff stats
colab/plugins/context_processors.py
  Diff comments   View file @d9c5a6a
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 from django.conf import settings 2 from django.conf import settings
3 3
4 4
5 -def proxied_apps(request):  
6 - proxied_apps = {} 5 +def colab_apps(request):
  6 + colab_apps = {}
7 7
8 for app_name, app in settings.COLAB_APPS.items(): 8 for app_name, app in settings.COLAB_APPS.items():
9 - proxied_apps[app_name] = app 9 + colab_apps[app_name] = app
10 10
11 - return {'proxy': proxied_apps} 11 + return {'plugins': colab_apps}
colab/plugins/templatetags/plugins.py
  Diff comments   View file @d9c5a6a
@@ -25,10 +25,9 @@ def plugins_menu(context): @@ -25,10 +25,9 @@ def plugins_menu(context):
25 return menu_from_cache 25 return menu_from_cache
26 26
27 menu_links = OrderedDict() 27 menu_links = OrderedDict()
28 - proxied_apps = context.get('proxy', {}) 28 + colab_apps = context.get('plugins', {})
29 29
30 - # TODO: change name from proxied_apps to something with plugins =)  
31 - for app_name, app in proxied_apps.items(): 30 + for app_name, app in colab_apps.items():
32 if not app.get('menu_urls'): 31 if not app.get('menu_urls'):
33 continue 32 continue
34 33
colab/settings.py
  Diff comments   View file @d9c5a6a
@@ -194,7 +194,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( @@ -194,7 +194,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
194 'django.core.context_processors.request', 194 'django.core.context_processors.request',
195 'django_mobile.context_processors.is_mobile', 195 'django_mobile.context_processors.is_mobile',
196 'colab.super_archives.context_processors.mailarchive', 196 'colab.super_archives.context_processors.mailarchive',
197 - 'colab.plugins.context_processors.proxied_apps', 197 + 'colab.plugins.context_processors.colab_apps',
198 'colab.home.context_processors.robots', 198 'colab.home.context_processors.robots',
199 'colab.home.context_processors.ribbon', 199 'colab.home.context_processors.ribbon',
200 'colab.home.context_processors.google_analytics', 200 'colab.home.context_processors.google_analytics',