[kupu-checkins] r33550 - in kupu/trunk/kupu: Extensions plone plone/kupu_references

[duncan at codespeak.net]

Author: duncan
Date: Mon Oct 23 13:08:58 2006
New Revision: 33550

Modified:
   kupu/trunk/kupu/Extensions/Install.py
   kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt
   kupu/trunk/kupu/plone/plonelibrarytool.py
Log:
Make kupu's reference browser install off by default.
Fix reference browser to work on Zope 2.10: some strings have become unicode.
Recook javascript registry after toggling kupu reference browser.



Modified: kupu/trunk/kupu/Extensions/Install.py
==============================================================================
--- kupu/trunk/kupu/Extensions/Install.py	(original)
+++ kupu/trunk/kupu/Extensions/Install.py	Mon Oct 23 13:08:58 2006
@@ -40,7 +40,8 @@
     """
     # register the plone skin layers
     register_layer(self, 'plone/kupu_plone_layer', 'kupu_plone', out)
-    register_layer(self, 'plone/kupu_references', 'kupu_references', out)
+    # Leave the reference browser turned off by default :(
+    #register_layer(self, 'plone/kupu_references', 'kupu_references', out)
     register_layer(self, 'tests', 'kupu_tests', out)
 
     # register as editor

Modified: kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_references/referencebrowser.pt	Mon Oct 23 13:08:58 2006
@@ -93,7 +93,7 @@
         <div metal:fill-slot="widget_body"
              tal:define="multiVal python:test(field.multiValued, 1, 0);
                          fieldName fieldName;
-                         rFieldName python:`fieldName`;
+                         rFieldName python:repr(unicode(fieldName))[1:];
                          fieldRealName field/getName;
                          portal_type context/portal_type;
                          kupu here/kupu_library_tool;
@@ -101,7 +101,7 @@
                          resource_type string:$portal_type.$fieldName;
                          rt python:kupu.getResourceType(resource_type);
                          label widget/label;
-                         rLabel python:`label`;
+                         rLabel python:repr(unicode(label))[1:];
                          uids python:same_type(value, []) and value or [value];
                          uids python:[u for u in uids if u];
                          types_param python:','.join(field.allowed_types);

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Mon Oct 23 13:08:58 2006
@@ -587,6 +587,11 @@
                 util.register_layer(self, 'plone/kupu_references', 'kupu_references', out)
             else:
                 util.unregister_layers(self, ['kupu_references'], out)
+            # Force compressed javascript to be recomputed.
+            try:
+                self.portal_javascripts.cookResources()
+            except AttributeError:
+                pass
 
         if captioning is not None:
             self.captioning = captioning