Update app to the app registry API

apps/bootstrap/__init__.py

@@ -2,9 +2,9 @@ from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
-#from app_registry import register_app, UnableToRegister
 from navigation.api import bind_links
 from project_setup.api import register_setup
+from app_registry.models import App
 
 from .links import database_bootstrap, bootstrap_execute, erase_database_link
 from .api import BootstrapSimple, BootstrapPermit
@@ -14,7 +14,9 @@ register_setup(erase_database_link)
 bind_links([BootstrapSimple], [bootstrap_execute])
 bind_links([BootstrapPermit], [bootstrap_execute])
 
-#try:
-#    register_app('bootstrap', _(u'Database bootstrap'))
-#except UnableToRegister:
-#    pass
+try:
+    app = App.register('bootstrap', _(u'Database bootstrap'))
+except App.UnableToRegister:
+    pass
+else:
+    app.set_dependencies(['app_registry'])

apps/checkouts/__init__.py

@@ -3,8 +3,7 @@ from __future__ import absolute_import
 from django.utils.translation import ugettext_lazy as _
 
 from acls.api import class_permissions
-#from app_registry import register_app, UnableToRegister
-#from backups.api import AppBackup, ModelBackup
+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
@@ -42,9 +41,10 @@ checkouts_scheduler.start()
 
 initialize_document_checkout_extra_methods()
 
-#try:
-#    app = register_app('checkouts', _(u'Checkouts'))
-#except UnableToRegister:
-#    pass
-#else:
+try:
+    app = App.register('checkouts', _(u'Checkouts'))
+except App.UnableToRegister:
+    pass
+else:
+    app.set_dependencies(['app_registry'])
 #    AppBackup(app, [ModelBackup()])    

apps/document_indexing/__init__.py

@@ -6,8 +6,7 @@ from django.db.models.signals import post_save, pre_delete, post_delete
 from django.dispatch import receiver
 from django.utils.translation import ugettext_lazy as _
 
-#from backups.api import AppBackup, ModelBackup
-#from app_registry import register_app, UnableToRegister
+from app_registry.models import App
 from documents.models import Document
 from maintenance.api import MaintenanceNamespace
 from metadata.models import DocumentMetadata
@@ -72,9 +71,11 @@ def document_metadata_index_post_delete(sender, **kwargs):
     # TODO: save result in index log
     update_indexes(kwargs['instance'].document)
 
-#try:
-#    app = register_app('document_indexing', _(u'Document indexing'))
-#except UnableToRegister:
-#    pass
+try:
+    app = App.register('document_indexing', _(u'Document indexing'))
+except App.UnableToRegister:
+    pass
+else:
+    app.set_dependencies(['app_registry', 'documents'])
 #aelse:
 #    AppBackup(app, [ModelBackup()])

apps/documents/__init__.py

@@ -5,8 +5,7 @@ import tempfile
 from django.utils.translation import ugettext_lazy as _
 
 from acls.api import class_permissions
-#from backups.api import AppBackup, ModelBackup, FileBackup
-#from app_registry import register_app, UnableToRegister
+from app_registry.models import App
 from common.utils import validate_path, encapsulate
 from diagnostics.api import DiagnosticNamespace
 from history.permissions import PERMISSION_HISTORY_VIEW
@@ -139,9 +138,10 @@ class_permissions(Document, [
 
 register_statistics(get_statistics)
 
-#try:
-#    app = register_app('documents', _(u'Documents'))
-#except UnableToRegister:
-#    pass
-#else:
-#    AppBackup(app, [ModelBackup(), FileBackup(document_settings.STORAGE_BACKEND)])
+try:
+    app = App.register('documents', _(u'Documents'))
+except UnableToRegister:
+    pass
+else:
+    app.set_dependencies(['app_registry'])
+    #AppBackup(app, [ModelBackup(), FileBackup(document_settings.STORAGE_BACKEND)])

apps/history/__init__.py

@@ -2,8 +2,8 @@ from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
-#from backups.api import AppBackup, ModelBackup
-from app_registry import register_app, UnableToRegister
+from app_registry.models import App
+from app_registry.classes import ModelBackup
 from common.utils import encapsulate
 from navigation.api import bind_links, register_model_list_columns
 from project_tools.api import register_tool
@@ -32,8 +32,9 @@ register_model_list_columns(History, [
 bind_links([History], [history_details])
 
 try:
-    app = register_app('history', _(u'History'))
-except UnableToRegister:
+    app = App.register('history', _(u'History'))
+except App.UnableToRegister:
     pass
-#else:
-#    AppBackup(app, [ModelBackup()])
+else:
+    app.set_backup([ModelBackup()])
+    app.set_dependencies(['app_registry'])

apps/icons/__init__.py

@@ -0,0 +1,10 @@
+from django.utils.translation import ugettext_lazy as _
+
+from app_registry.models import App
+
+try:
+    app = App.register('icons', _(u'Icons'))
+except App.UnableToRegister:
+    pass
+else:
+    app.set_dependencies(['app_registry'])

apps/navigation/widgets.py

@@ -7,6 +7,8 @@ from django.template.defaultfilters import capfirst
 from django.core.exceptions import PermissionDenied
 from django.template import RequestContext
 
+from icons.api import get_icon_name, get_sprite_name
+from icons.literals import ERROR
 from permissions.models import Permission
 
 
@@ -27,7 +29,7 @@ def render_widget(request, link):
     if resolved_link:
         return mark_safe(u'<a style="text-decoration:none; margin-right: 10px;" href="%(url)s"><button style="vertical-align: top; padding: 1px; width: 110px; height: 100px; margin: 10px;"><img src="%(static_url)simages/icons/%(icon)s" alt="%(image_alt)s" /><p style="margin: 0px 0px 0px 0px;">%(string)s</p></button></a>' % {
             'url': resolved_link.url,
-            'icon': getattr(resolved_link, 'icon', 'link_button.png'),
+            'icon': get_icon_name(getattr(resolved_link, 'icon', ERROR)),
             'static_url': settings.STATIC_URL,
             'string': capfirst(resolved_link.text),
             'image_alt': _(u'icon'),