- OOo import now displays categories as well as properties of the portal type

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9099 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml

@@ -73,8 +73,11 @@
 property_list = []\n
 \n
 for portal_type in module.allowedContentTypes():\n
-  for property in portal_type.getInstancePropertyMap():\n
-    property_string = "%s.%s" % (portal_type.id, property[\'id\'])\n
+  #for property in portal_type.getInstancePropertyMap():\n
+    #property_string = "%s.%s" % (portal_type.id, property[\'id\'])\n
+    #property_list.append(property_string)\n
+  for property in portal_type.getPropertiesAndCategories():\n
+    property_string = "%s.%s" % (portal_type.id, property)\n
     property_list.append(property_string)\n
 \n
 property_list.sort()\n
@@ -89,7 +92,9 @@ return [(\'-- Ignore this Property --\', \'\')] + map(lambda x: (x,x), property_
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -132,7 +137,6 @@ return [(\'-- Ignore this Property --\', \'\')] + map(lambda x: (x,x), property_
                             <string>_getattr_</string>
                             <string>portal_type</string>
                             <string>property</string>
-                            <string>_getitem_</string>
                             <string>property_string</string>
                             <string>map</string>
                           </tuple>

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getSpreadsheetColumnNameList.xml

@@ -110,7 +110,9 @@ return listbox_lines\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/erp5_base/ERP5Site_getSpreadsheetColumnNameList</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoFastInput.xml

@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -86,7 +86,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_portal_type_property_list</string>
@@ -94,7 +94,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_import_file</string>

bt5/erp5_base/bt/revision

+10
\ No newline at end of file