[silva.ui][Sylvain Viollon] Update code and API.

author:    Sylvain Viollon
date:      Fri Aug 30 15:59:58 2013 +0200
revision:  653:852d74960247 in silva.ui
branch:    
details:   https://hg.infrae.com/silva.ui?cmd=changeset;node=852d74960247
modified:  src/silva/ui/rest/base.py src/silva/ui/rest/container/notifier.py src/silva/ui/rest/helper.py
added:     
removed:   
log:       Update code and API.


diffstat:

 src/silva/ui/rest/base.py               |  14 +++++++-------
 src/silva/ui/rest/container/notifier.py |  11 +++++------
 src/silva/ui/rest/helper.py             |   2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diffs (89 lines):

diff -r 587318a75547 -r 852d74960247 src/silva/ui/rest/base.py
--- a/src/silva/ui/rest/base.py	Wed Aug 28 11:08:38 2013 +0200
+++ b/src/silva/ui/rest/base.py	Fri Aug 30 15:59:58 2013 +0200
@@ -15,7 +15,7 @@
 from infrae.rest.interfaces import IRESTComponent
 from silva.core.interfaces import IRoot, ISilvaObject, IVersion
 from silva.core.interfaces.adapters import IIconResolver
-from silva.core.services import task_queue
+from silva.core.services import CatalogingTask
 
 from ..interfaces import IUIScreen
 from ..menu import ContentMenu, ViewMenu, ActionMenu, UserMenu
@@ -54,7 +54,7 @@
         # Note: this will abort any previous changes.
         transaction.get().abort()
         self.transaction = transaction.begin()
-        task_queue.activate()
+        CatalogingTask.get().activate()
 
     def __exit__(self, t, v, tb):
         if v is None and not self.transaction.isDoomed():
@@ -125,7 +125,7 @@
         parents.reverse()
         return {'current': parents}
 
-    def get_metadata_menu(self, menu):
+    def get_menu_entries(self, menu):
         entries = menu.get_entries(self.context).describe(self)
         if not entries:
             return None
@@ -145,10 +145,10 @@
                     self.request).get_content_url(self.context),
             },
             'menu': {
-                'content': self.get_metadata_menu(ContentMenu),
-                'view': self.get_metadata_menu(ViewMenu),
-                'actions': self.get_metadata_menu(ActionMenu),
-                'user': self.get_metadata_menu(UserMenu),
+                'content': self.get_menu_entries(ContentMenu),
+                'view': self.get_menu_entries(ViewMenu),
+                'actions': self.get_menu_entries(ActionMenu),
+                'user': self.get_menu_entries(UserMenu),
             },
             'path': self.get_content_path(self.context),
         }
diff -r 587318a75547 -r 852d74960247 src/silva/ui/rest/container/notifier.py
--- a/src/silva/ui/rest/container/notifier.py	Wed Aug 28 11:08:38 2013 +0200
+++ b/src/silva/ui/rest/container/notifier.py	Fri Aug 30 15:59:58 2013 +0200
@@ -94,23 +94,22 @@
     """
 
     def __init__(self, request):
-        self.__send = getUtility(IMessageService).send
+        self._send = getUtility(IMessageService).send
         self.request = request
 
         adapter = IUserPreferredLanguages(self.request)
         languages = adapter.getPreferredLanguages()
         if languages:
-            self.__language = languages[0]
+            self._language = languages[0]
         else:
-            self.__language = 'en'
+            self._language = 'en'
 
     def translate(self, message):
         return translate(
-            message, target_language=self.__language, context=self.request)
-
+            message, target_language=self._language, context=self.request)
 
     def notify(self, message, type=u""):
-        self.__send(message, self.request, namespace=type)
+        self._send(message, self.request, namespace=type)
 
     @cofunction
     def __call__(self, parent, success_msg, failed_msg):
diff -r 587318a75547 -r 852d74960247 src/silva/ui/rest/helper.py
--- a/src/silva/ui/rest/helper.py	Wed Aug 28 11:08:38 2013 +0200
+++ b/src/silva/ui/rest/helper.py	Fri Aug 30 15:59:58 2013 +0200
@@ -136,7 +136,7 @@
         data['resources'] = urls
 
 
-class NavigationInvalidationProvider(grok.MultiSubscription):
+class NavigationProvider(grok.MultiSubscription):
     grok.implements(IUIPlugin)
     grok.provides(IUIPlugin)
     grok.adapts(Interface, IDefaultBrowserLayer)