Download as
Browse Code »

Commit e0dc6a6c8ed9a5f90520c636cc3a1a9353bae597

Authored by Sergio Oliveira
1 parent 57470863
Exists in master and in 29 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, colab-vcard, colab_search, colab_tag, colab_tag_merge, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, 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

Removed PROXIED_APPS (replaced by COLAB_APPS) 

Signed-off-by: Sergio Oliveira <sergio@tracy.com.br>
Showing 5 changed files with 5 additions and 10 deletions   Show diff stats
colab/plugins/gitlab/data_api.py
  Diff comments   View file @e0dc6a6
@@ -18,7 +18,7 @@ LOGGER = logging.getLogger(&#39;colab.plugin.gitlab&#39;) @@ -18,7 +18,7 @@ LOGGER = logging.getLogger(&#39;colab.plugin.gitlab&#39;)
18 class GitlabDataAPI(ProxyDataAPI): 18 class GitlabDataAPI(ProxyDataAPI):
19 19
20 def get_request_url(self, path, **kwargs): 20 def get_request_url(self, path, **kwargs):
21 - proxy_config = settings.PROXIED_APPS.get(self.app_label, {}) 21 + proxy_config = settings.COLAB_APPS.get(self.app_label, {})
22 22
23 upstream = proxy_config.get('upstream') 23 upstream = proxy_config.get('upstream')
24 kwargs['private_token'] = proxy_config.get('private_token') 24 kwargs['private_token'] = proxy_config.get('private_token')
colab/plugins/noosfero/data_api.py
  Diff comments   View file @e0dc6a6
@@ -18,7 +18,7 @@ LOGGER = logging.getLogger(&#39;colab.plugin.debug&#39;) @@ -18,7 +18,7 @@ LOGGER = logging.getLogger(&#39;colab.plugin.debug&#39;)
18 class NoosferoDataAPI(ProxyDataAPI): 18 class NoosferoDataAPI(ProxyDataAPI):
19 19
20 def get_request_url(self, path, **kwargs): 20 def get_request_url(self, path, **kwargs):
21 - proxy_config = settings.PROXIED_APPS.get(self.app_label, {}) 21 + proxy_config = settings.COLAB_APPS.get(self.app_label, {})
22 22
23 upstream = proxy_config.get('upstream') 23 upstream = proxy_config.get('upstream')
24 kwargs['private_token'] = proxy_config.get('private_token') 24 kwargs['private_token'] = proxy_config.get('private_token')
colab/plugins/utils/views.py
  Diff comments   View file @e0dc6a6
@@ -13,7 +13,7 @@ class ColabProxyView(DiazoProxyView): @@ -13,7 +13,7 @@ class ColabProxyView(DiazoProxyView):
13 13
14 @property 14 @property
15 def upstream(self): 15 def upstream(self):
16 - proxy_config = settings.PROXIED_APPS.get(self.app_label, {}) 16 + proxy_config = settings.COLAB_APPS.get(self.app_label, {})
17 return proxy_config.get('upstream') 17 return proxy_config.get('upstream')
18 18
19 @property 19 @property
colab/search/utils.py
  Diff comments   View file @e0dc6a6
@@ -57,11 +57,10 @@ def get_collaboration_data(logged_user, filter_by_user=None): @@ -57,11 +57,10 @@ def get_collaboration_data(logged_user, filter_by_user=None):
57 57
58 latest_results.extend(messages) 58 latest_results.extend(messages)
59 59
60 - app_names = settings.PROXIED_APPS.keys() 60 + app_names = settings.COLAB_APPS.keys()
61 61
62 for app_name in app_names: 62 for app_name in app_names:
63 - module = importlib \  
64 - .import_module('colab.plugins.{}.models'.format(app_name)) 63 + module = importlib.import_module('{}.models'.format(app_name))
65 64
66 for module_item_name in dir(module): 65 for module_item_name in dir(module):
67 module_item = getattr(module, module_item_name) 66 module_item = getattr(module, module_item_name)
colab/settings.py
  Diff comments   View file @e0dc6a6
@@ -258,7 +258,6 @@ locals().update(conf.load_py_settings()) @@ -258,7 +258,6 @@ locals().update(conf.load_py_settings())
258 locals().update(conf.load_colab_apps()) 258 locals().update(conf.load_colab_apps())
259 259
260 COLAB_APPS = locals().get('COLAB_APPS') or {} 260 COLAB_APPS = locals().get('COLAB_APPS') or {}
261 -PROXIED_APPS = {}  
262 261
263 for app_name, app in COLAB_APPS.items(): 262 for app_name, app in COLAB_APPS.items():
264 if 'dependencies' in app: 263 if 'dependencies' in app:
@@ -269,9 +268,6 @@ for app_name, app in COLAB_APPS.items(): @@ -269,9 +268,6 @@ for app_name, app in COLAB_APPS.items():
269 if app_name not in INSTALLED_APPS: 268 if app_name not in INSTALLED_APPS:
270 INSTALLED_APPS += (app_name,) 269 INSTALLED_APPS += (app_name,)
271 270
272 - if app.get('upstream'):  
273 - PROXIED_APPS[app_name.split('.')[-1]] = app  
274 -  
275 if 'middlewares' in app: 271 if 'middlewares' in app:
276 for middleware in app.get('middlewares'): 272 for middleware in app.get('middlewares'):
277 if middleware not in MIDDLEWARE_CLASSES: 273 if middleware not in MIDDLEWARE_CLASSES: