From d877c831e320ffc6d6fce31b97b86ab9843ad5a1 Mon Sep 17 00:00:00 2001
From: Gust <darksshades@hotmail.com>
Date: Tue, 25 Aug 2015 15:14:48 -0300
Subject: [PATCH] Fix app_label in COLAB_APPS

---
 colab/search/utils.py | 6 ++----
 colab/settings.py     | 4 ++--
 colab/utils/conf.py   | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/colab/search/utils.py b/colab/search/utils.py
index e3d15b9..3ea25d9 100644
--- a/colab/search/utils.py
+++ b/colab/search/utils.py
@@ -57,10 +57,8 @@ def get_collaboration_data(logged_user, filter_by_user=None):
 
     latest_results.extend(messages)
 
-    app_names = settings.COLAB_APPS.keys()
-
-    for app_name in app_names:
-        module = importlib.import_module('{}.models'.format(app_name))
+    for app in settings.COLAB_APPS.values():
+        module = importlib.import_module('{}.models'.format(app.get('name')))
 
         for module_item_name in dir(module):
             module_item = getattr(module, module_item_name)
diff --git a/colab/settings.py b/colab/settings.py
index 0ae4cdb..7323b85 100644
--- a/colab/settings.py
+++ b/colab/settings.py
@@ -266,8 +266,8 @@ for app_name, app in COLAB_APPS.items():
             if dep not in INSTALLED_APPS:
                 INSTALLED_APPS += (dep,)
 
-    if app_name not in INSTALLED_APPS:
-        INSTALLED_APPS += (app_name,)
+    if app.get('name') not in INSTALLED_APPS:
+        INSTALLED_APPS += (app.get('name'),)
 
     if 'middlewares' in app:
         for middleware in app.get('middlewares'):
diff --git a/colab/utils/conf.py b/colab/utils/conf.py
index 0230fe2..6fc94fc 100644
--- a/colab/utils/conf.py
+++ b/colab/utils/conf.py
@@ -104,7 +104,7 @@ def load_colab_apps():
             app_name = file_name
 
         elif file_name.endswith('.py'):
-            app_name = py_settings_d.get('name')
+            app_name = py_settings_d.get('name').split('.')[-1]
 
         if not app_name:
             logger.warning("Plugin missing name variable (%s)", file_name)
@@ -121,7 +121,7 @@ def load_colab_apps():
 
         fields = ['verbose_name', 'upstream', 'urls',
                   'menu_urls', 'middlewares', 'dependencies',
-                  'context_processors', 'private_token']
+                  'context_processors', 'private_token', 'name']
 
         for key in fields:
             value = py_settings_d.get(key)
--
libgit2 0.21.2