Collection of changes. Fixed naming of local role actions. Improved Image...

Collection of changes. Fixed naming of local role actions. Improved Image Module listbox to display thumbnails. Hardcoded a quickfix for advanced search. New revision.

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

bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/local_permission.xml

@@ -81,7 +81,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewLocalPermission</string> </value>
+            <value> <string>string:${object_url}/Base_viewLocalPermissionList</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/local_permission.xml

@@ -81,7 +81,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewLocalPermission</string> </value>
+            <value> <string>string:${object_url}/Base_viewLocalPermissionList</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/local_permission.xml

@@ -81,7 +81,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewLocalPermission</string> </value>
+            <value> <string>string:${object_url}/Base_viewLocalPermissionList</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml

@@ -131,7 +131,7 @@ if lng and lng != \'0\':\n
   search_string += \' language:%s\' % lng\n
 \n
 # category search\n
-for category in (context.portal_preferences.getPreferredDocumentBaseCategoryList() or ()):\n
+for category in (\'group\', \'site\', \'function\', \'publication_section\', \'classification\'):\n
   category_value = req.get(\'subfield_field_your_category_list_\' + category)\n
   if category_value:\n
     search_string += \' %s:%s\' % (category, category_value)\n
@@ -153,8 +153,6 @@ if search_mode and search_mode_map.has_key(search_mode):\n
   search_string += \' mode:%s\' % search_mode_map[search_mode]\n
 \n
 return search_string\n
-\n
-# vim: filetype=python syntax=python shiftwidth=2\n
 </string> </value>
         </item>
         <item>

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ImageModule_viewImageList.xml

@@ -65,6 +65,7 @@
                 <string>right</string>
                 <string>center</string>
                 <string>bottom</string>
+                <string>hidden</string>
               </list>
             </value>
         </item>
@@ -86,6 +87,14 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key>                 <string>hidden</string> </key>
+                    <value>
+                      <list>
+                        <string>listbox_thumbnail</string>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>left</string> </key>
                     <value>

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ImageModule_viewImageList/listbox.xml

@@ -333,22 +333,10 @@
                     <key> <string>columns</string> </key>
                     <value>
                       <list>
-                        <tuple>
-                          <string>id</string>
-                          <string>ID</string>
-                        </tuple>
-                        <tuple>
-                          <string>getPortalType</string>
-                          <string>Type</string>
-                        </tuple>
                         <tuple>
                           <string>reference</string>
                           <string>Reference</string>
                         </tuple>
-                        <tuple>
-                          <string>short_title</string>
-                          <string>Short Title</string>
-                        </tuple>
                         <tuple>
                           <string>title</string>
                           <string>Title</string>
@@ -361,14 +349,14 @@
                           <string>version</string>
                           <string>Version</string>
                         </tuple>
-                        <tuple>
-                          <string>int_index</string>
-                          <string>Index</string>
-                        </tuple>
                         <tuple>
                           <string>validation_state</string>
                           <string>State</string>
                         </tuple>
+                        <tuple>
+                          <string>thumbnail</string>
+                          <string>Thumbnail</string>
+                        </tuple>
                       </list>
                     </value>
                 </item>
@@ -430,7 +418,12 @@
                 <item>
                     <key> <string>editable_columns</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <tuple>
+                          <string>thumbnail</string>
+                          <string>Thumbnail</string>
+                        </tuple>
+                      </list>
                     </value>
                 </item>
                 <item>

bt5/erp5_dms/bt/revision

-613
+621
\ No newline at end of file