From ed9723b5f86e705639017bee81aedececd97d21e Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 22 Oct 2014 15:52:09 -0400 Subject: [PATCH] Issue #90, #56, Remove app_registry app --- mayan/apps/app_registry/__init__.py | 19 ----------- mayan/apps/app_registry/models.py | 50 ----------------------------- mayan/apps/rest_api/__init__.py | 6 ++++ mayan/apps/rest_api/registry.py | 5 --- mayan/apps/statistics/__init__.py | 6 +++- mayan/apps/statistics/registry.py | 9 ------ mayan/settings/base.py | 1 - 7 files changed, 11 insertions(+), 85 deletions(-) delete mode 100644 mayan/apps/app_registry/__init__.py delete mode 100644 mayan/apps/app_registry/models.py delete mode 100644 mayan/apps/rest_api/registry.py delete mode 100644 mayan/apps/statistics/registry.py diff --git a/mayan/apps/app_registry/__init__.py b/mayan/apps/app_registry/__init__.py deleted file mode 100644 index 8ba2fa6c90..0000000000 --- a/mayan/apps/app_registry/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -from __future__ import absolute_import - -import logging - -from django.conf import settings -from django.utils.importlib import import_module - -from .models import App - -logger = logging.getLogger(__name__) - - -def register_apps(): - for app_name in settings.INSTALLED_APPS: - logger.debug('registering: %s' % app_name) - App.register(app_name) - - -register_apps() diff --git a/mayan/apps/app_registry/models.py b/mayan/apps/app_registry/models.py deleted file mode 100644 index bdc88402aa..0000000000 --- a/mayan/apps/app_registry/models.py +++ /dev/null @@ -1,50 +0,0 @@ -from __future__ import absolute_import - -import logging - -from django.db import models -from django.utils.importlib import import_module - -from navigation.api import register_top_menu -from project_setup.api import register_setup -from project_tools.api import register_tool - -logger = logging.getLogger(__name__) - - -class App(object): - @classmethod - def register(cls, app_name): - logger.debug('Trying to import: %s' % app_name) - try: - app_module = import_module(app_name) - except ImportError: - logger.debug('Unable to import app: %s' % app_name) - else: - logger.debug('Trying to import registry from: %s' % app_name) - try: - registration = import_module('%s.registry' % app_name) - except ImportError as e: - logger.debug('Unable to import registry for app: %s; %s' % (app_name, e)) - else: - if not getattr(registration, 'disabled', False): - app = App() - app.name = app_name - # If there are not error go ahead with the stored app instance - app.label = getattr(registration, 'label', app_name) - app.description = getattr(registration, 'description', u'') - - for link in getattr(registration, 'setup_links', []): - logger.debug('setup link: %s' % link) - register_setup(link) - - for link in getattr(registration, 'tool_links', []): - logger.debug('tool link: %s' % link) - register_tool(link) - - for index, link in enumerate(getattr(registration, 'menu_links', [])): - logger.debug('menu_link: %s' % link) - register_top_menu(name='%s.%s' % (app_name, index), link=link) - - def __unicode__(self): - return unicode(self.label) diff --git a/mayan/apps/rest_api/__init__.py b/mayan/apps/rest_api/__init__.py index 3b434cfaea..57e887891f 100644 --- a/mayan/apps/rest_api/__init__.py +++ b/mayan/apps/rest_api/__init__.py @@ -2,9 +2,15 @@ from __future__ import absolute_import from django.utils.translation import ugettext_lazy as _ +from project_tools.api import register_tool + from .classes import APIEndPoint +from .links import link_api, link_api_documentation from .urls import api_urls endpoint = APIEndPoint('rest_api') endpoint.register_urls(api_urls) endpoint.add_endpoint('auth_token_obtain', _(u'Obtain an API authentication token.')) + +register_tool(link_api) +register_tool(link_api_documentation) diff --git a/mayan/apps/rest_api/registry.py b/mayan/apps/rest_api/registry.py deleted file mode 100644 index ffb901e5dc..0000000000 --- a/mayan/apps/rest_api/registry.py +++ /dev/null @@ -1,5 +0,0 @@ -from __future__ import absolute_import - -from .links import link_api, link_api_documentation - -tool_links = [link_api, link_api_documentation] diff --git a/mayan/apps/statistics/__init__.py b/mayan/apps/statistics/__init__.py index 622534a022..785e9eeaa8 100644 --- a/mayan/apps/statistics/__init__.py +++ b/mayan/apps/statistics/__init__.py @@ -2,9 +2,13 @@ from __future__ import absolute_import from navigation.api import register_links +from project_tools.api import register_tool + from .classes import Statistic, StatisticNamespace -from .links import link_execute, link_namespace_details, link_namespace_list +from .links import (link_execute, link_namespace_details, link_namespace_list, + link_statistics) register_links(StatisticNamespace, [link_namespace_details]) register_links([StatisticNamespace, 'statistics:namespace_list', 'statistics:execute'], [link_namespace_list], menu_name='secondary_menu') register_links(Statistic, [link_execute]) +register_tool(link_statistics) diff --git a/mayan/apps/statistics/registry.py b/mayan/apps/statistics/registry.py deleted file mode 100644 index b64b40827c..0000000000 --- a/mayan/apps/statistics/registry.py +++ /dev/null @@ -1,9 +0,0 @@ -from __future__ import absolute_import - -from django.utils.translation import ugettext_lazy as _ - -from .links import link_statistics - -label = _(u'Statistics') -description = _(u'Central place to store and display app statistics.') -tool_links = [link_statistics] diff --git a/mayan/settings/base.py b/mayan/settings/base.py index 2c592ad053..850698354a 100644 --- a/mayan/settings/base.py +++ b/mayan/settings/base.py @@ -72,7 +72,6 @@ INSTALLED_APPS = ( 'smart_settings', 'user_management', # Mayan EDMS - 'app_registry', 'checkouts', 'document_acls', 'document_comments',