[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kupu-checkins
Subject:    [kupu-checkins] r35727 - in kupu/trunk/kupu/plone: .
From:       duncan () codespeak ! net
Date:       2006-12-14 9:45:39
Message-ID: 20061214094539.7AE6610080 () code0 ! codespeak ! net
[Download RAW message or body]

Author: duncan
Date: Thu Dec 14 10:45:36 2006
New Revision: 35727

Modified:
   kupu/trunk/kupu/plone/librarytool.py
   kupu/trunk/kupu/plone/profiles/default/skins.xml
Log:
Fix skin ordering. Checking for new resource types was broken

Modified: kupu/trunk/kupu/plone/librarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/librarytool.py	(original)
+++ kupu/trunk/kupu/plone/librarytool.py	Thu Dec 14 10:45:36 2006
@@ -149,23 +149,26 @@
             self._res_newtype[resource_type] = mode
             self._res_newtype = self._res_newtype # Flag ourselves as modified.
 
-    def checkNewResourceTypes(self):
+    def checkNewResourceTypes(self, resource_type=None):
         # Check for new types added. It would be nice if this
         # was called automatically but not every time we query a
         # resource.
-        handle_new = self.getNewTypeHandler(resource_type)
-        if handle_new != NEWTYPE_IGNORE:
-            typetool = getToolByName(self, 'portal_types')
-            new_portal_types = dict([ (t.id, 1) for t in typetool.listTypeInfo()])
-            if getattr(self, '_last_known_types', None) is None:
-                # Migrate from old version
-                self._last_known_types = all_portal_types
-            else:
-                for t in new_types:
-                    if t in new_portal_types:
-                        del new_portal_types[t]
-                if new_portal_types:
-                    self._addNewTypesToResources()
+        if resource_type != None:
+            handle_new = self.getNewTypeHandler(resource_type)
+            if handle_new == NEWTYPE_IGNORE:
+                return
+                
+        typetool = getToolByName(self, 'portal_types')
+        new_portal_types = dict([ (t.id, 1) for t in typetool.listTypeInfo()])
+        if getattr(self, '_last_known_types', None) is None:
+            # Migrate from old version
+            self._last_known_types = new_portal_types
+        else:
+            for t in self._last_known_types:
+                if t in new_portal_types:
+                    del new_portal_types[t]
+            if new_portal_types:
+                self._addNewTypesToResources()
 
     def _addNewTypesToResources(self):
         """This method is called when the list of types in the system has changed.

Modified: kupu/trunk/kupu/plone/profiles/default/skins.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/skins.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/skins.xml	Thu Dec 14 10:45:36 2006
@@ -9,8 +9,8 @@
  <object name="kupu_tests" meta_type="Filesystem Directory View"
     directory="kupu/tests"/>
  <skin-path name="*">
-  <layer name="kupu" insert-before="plone_scripts"/>
+  <layer name="kupu" insert-before="*"/>
   <layer name="kupu_plone" insert-before="kupu"/>
-  <layer name="kupu_tests" insert-before="plone_scripts"/>
+  <layer name="kupu_tests" insert-after="kupu"/>
  </skin-path>
 </object>

[prev in list] [next in list] [prev in thread] [next in thread]