diff --git a/apps/backups/__init__.py b/apps/backups/__init__.py index 19cdead95a..839c6541dd 100644 --- a/apps/backups/__init__.py +++ b/apps/backups/__init__.py @@ -1,7 +1,6 @@ from __future__ import absolute_import import inspect -#import runpy from django.conf import settings from django.db import transaction, DatabaseError @@ -11,7 +10,7 @@ from django.utils.importlib import import_module #from common.utils import encapsulate #from job_processor.exceptions import JobQueuePushError #from job_processor.models import JobQueue, JobType -from project_tools.api import register_tool +#from project_tools.api import register_tool #from project_setup.api import register_setup #from navigation.api import bind_links, register_model_list_columns @@ -21,7 +20,7 @@ from project_tools.api import register_tool # restore_tool_link, backup_job_list, backup_job_create, backup_job_edit, # backup_job_test) #from .literals import BACKUP_JOB_QUEUE_NAME -from .models import App +#from .models import App #from . import models #class UnableToRegister(Exception): @@ -62,19 +61,3 @@ from .models import App #]) ###app.set_backup([ModelBackup()]) - - -for app_name in settings.INSTALLED_APPS: - App.register(app_name) - print 'registry', app_name - - try: - post_init = import_module('%s.post_init' % app_name) - except ImportError: - pass - else: - print 'post', post_init - if post_init: - for name, value in inspect.getmembers(post_init): - if hasattr(value, '__call__') and name.startswith('init'): - value() diff --git a/apps/bootstrap/__init__.py b/apps/bootstrap/__init__.py index 26469335aa..76b5145882 100644 --- a/apps/bootstrap/__init__.py +++ b/apps/bootstrap/__init__.py @@ -3,20 +3,20 @@ from __future__ import absolute_import from django.utils.translation import ugettext_lazy as _ from navigation.api import bind_links -from project_setup.api import register_setup -from app_registry.models import App +#from project_setup.api import register_setup from .links import database_bootstrap, bootstrap_execute, erase_database_link from .api import BootstrapSimple, BootstrapPermit -register_setup(database_bootstrap) -register_setup(erase_database_link) +#register_setup(database_bootstrap) +#register_setup(erase_database_link) bind_links([BootstrapSimple], [bootstrap_execute]) bind_links([BootstrapPermit], [bootstrap_execute]) - +""" try: app = App.register('bootstrap', _(u'Database bootstrap')) except App.UnableToRegister: pass else: app.set_dependencies(['app_registry']) +""" diff --git a/apps/checkouts/__init__.py b/apps/checkouts/__init__.py index 79dfe76ec7..ec0ec1e82c 100644 --- a/apps/checkouts/__init__.py +++ b/apps/checkouts/__init__.py @@ -3,7 +3,6 @@ from __future__ import absolute_import from django.utils.translation import ugettext_lazy as _ from acls.api import class_permissions -from app_registry.models import App from documents.models import Document from navigation.api import bind_links, register_top_menu from scheduler.api import LocalScheduler @@ -39,12 +38,4 @@ checkouts_scheduler = LocalScheduler('checkouts', _(u'Document checkouts')) checkouts_scheduler.add_interval_job('task_check_expired_check_outs', _(u'Check expired check out documents and checks them in.'), task_check_expired_check_outs, seconds=CHECK_EXPIRED_CHECK_OUTS_INTERVAL) checkouts_scheduler.start() -initialize_document_checkout_extra_methods() - -try: - app = App.register('checkouts', _(u'Checkouts')) -except App.UnableToRegister: - pass -else: - app.set_dependencies(['app_registry']) -# AppBackup(app, [ModelBackup()]) +initialize_document_checkout_extra_methods()