Author: jmorliaguet
Date: Sat May 13 15:19:22 2006
New Revision: 3121

Modified:
   cpsskins/branches/paris-sprint-2006/ui/editing/use_setting.pt
   cpsskins/branches/paris-sprint-2006/ui/editing/views.py

Log:

- began working on the settings' UI



Modified: cpsskins/branches/paris-sprint-2006/ui/editing/use_setting.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/editing/use_setting.pt       
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/editing/use_setting.pt       Sat May 
13 15:19:22 2006
@@ -5,12 +5,14 @@
 
       <h2>Select a setting</h2>
       <ul tal:define="setting_info context/@@getSettingInfo;
-                      format_type request/form/format|string:''">
+                      format_type request/form/format_type|string:''">
+          <tal:block content="setting_info" />
+          <tal:block content="format_type" />
         <li tal:condition="python: format_type in setting_info"
             tal:repeat="info setting_info/?format_type">
-          <tal:block define="name info/name">
+          <tal:block define="uri info/uri">
             <a href=""
-               tal:attributes="href string:./@@useSettingAsFormat?name=$name"
+               tal:attributes="href string:./@@useSettingAsFormat?uri=$uri"
                tal:content="info/name" />
           </tal:block>
         </li>

Modified: cpsskins/branches/paris-sprint-2006/ui/editing/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/editing/views.py     (original)
+++ cpsskins/branches/paris-sprint-2006/ui/editing/views.py     Sat May 13 
15:19:22 2006
@@ -238,22 +238,23 @@
         target = self.request.get('HTTP_REFERER', '.')
         self.request.response.redirect(target)
 
-    def useSettingAsFormat(self, name=u''):
-        """Use a setting specified by its name ('name') as a format
+    def useSettingAsFormat(self, uri=u''):
+        """Use a setting specified by its URI as a format
 
         The context is the display
 
         """
         context = self.context
-        if not name:
-            raise KeyError("Must specify a setting's name.")
+        if not uri:
+            raise KeyError("Must specify a setting's URI.")
 
         if not IDisplay.providedBy(context):
             raise TypeError("The context must be a display.")
 
-        setting = queryUtility(ISetting, name)
+        resources = getUtility(IResourceManager)
+        setting = resources.lookup(uri=uri, context=context)
         if setting is None:
-            raise KeyError("No such setting: '%s'." % name)
+            raise KeyError("No such setting: '%s'." % uri)
 
         resource = IResource(setting).getResource()
         if not IFormat.providedBy(resource):
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to