Changed names of some portal types to follow convention and guidelines

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

bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml

@@ -5,17 +5,20 @@
  <portal_type id="Document Module">
   <item>Text</item>
   <item>External Library File</item>
+  <item>External Web Page</item>
   <item>Spreadsheet</item>
   <item>Presentation</item>
   <item>DMS File</item>
-  <item>Graphic</item>
-  <item>External Web Page</item>
-  <item>PdfDocument</item>
+  <item>PDF</item>
+  <item>Drawing</item>
  </portal_type>
- <portal_type id="File">
+ <portal_type id="Drawing">
   <item>Role Definition</item>
  </portal_type>
- <portal_type id="Graphic">
+ <portal_type id="External Library File">
+  <item>Book</item>
+ </portal_type>
+ <portal_type id="File">
   <item>Role Definition</item>
  </portal_type>
  <portal_type id="Image Module">
@@ -24,7 +27,7 @@
  <portal_type id="ImageDocument">
   <item>Role Definition</item>
  </portal_type>
- <portal_type id="PdfDocument">
+ <portal_type id="PDF">
   <item>Role Definition</item>
  </portal_type>
  <portal_type id="Presentation">

bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Book%20Information.xml → bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Book.xml

@@ -91,7 +91,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Book Information</string> </value>
+            <value> <string>Book</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>

bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Graphic.xml → bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Drawing.xml

@@ -94,7 +94,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Graphic</string> </value>
+            <value> <string>Drawing</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>
@@ -108,7 +108,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Graphic</string> </value>
+            <value> <string>Drawing</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_dms/PortalTypeTemplateItem/portal_types/PdfDocument.xml → bt5/erp5_dms/PortalTypeTemplateItem/portal_types/PDF.xml

@@ -89,7 +89,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>PdfDocument</string> </value>
+            <value> <string>PDF</string> </value>
         </item>
         <item>
             <key> <string>init_script</string> </key>

bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -3,6 +3,10 @@
   <type>DMS File</type>
   <workflow>document_publication_workflow, edit_workflow, local_permission_interaction_workflow, dms_file_interaction_workflow</workflow>
  </chain>
+ <chain>
+  <type>Drawing</type>
+  <workflow>local_permission_interaction_workflow, edit_workflow, dms_file_interaction_workflow, document_publication_workflow, ooo_interaction_workflow</workflow>
+ </chain>
  <chain>
   <type>External Library File</type>
   <workflow>edit_workflow, external_document_publication_workflow, external_document_interaction_workflow</workflow>
@@ -11,17 +15,13 @@
   <type>External Web Page</type>
   <workflow>edit_workflow, external_document_interaction_workflow, external_document_publication_workflow</workflow>
  </chain>
- <chain>
-  <type>Graphic</type>
-  <workflow>ooo_interaction_workflow, edit_workflow, local_permission_interaction_workflow, dms_file_interaction_workflow, document_publication_workflow</workflow>
- </chain>
  <chain>
   <type>ImageDocument</type>
-  <workflow>dms_file_interaction_workflow, local_permission_interaction_workflow, document_publication_workflow, edit_workflow</workflow>
+  <workflow>dms_file_interaction_workflow, document_publication_workflow, local_permission_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
-  <type>PdfDocument</type>
-  <workflow>dms_file_interaction_workflow, edit_workflow, document_publication_workflow, local_permission_interaction_workflow</workflow>
+  <type>PDF</type>
+  <workflow>local_permission_interaction_workflow, edit_workflow, dms_file_interaction_workflow, document_publication_workflow</workflow>
  </chain>
  <chain>
   <type>Presentation</type>

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/BookInformation_view.xml

@@ -130,6 +130,10 @@
             <key> <string>name</string> </key>
             <value> <string>BookInformation_view</string> </value>
         </item>
+        <item>
+            <key> <string>pt</string> </key>
+            <value> <string>form_view</string> </value>
+        </item>
         <item>
             <key> <string>row_length</string> </key>
             <value> <int>4</int> </value>
@@ -140,12 +144,16 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Book Information</string> </value>
+            <value> <string>Book</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
             <value> <int>0</int> </value>
         </item>
+        <item>
+            <key> <string>update_action</string> </key>
+            <value> <string></string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getBaseCategoryList.xml

@@ -73,7 +73,7 @@
 # and to add a base category add it in DMSFile property sheets\n
 # or manuall for all these portal_types\n
 \n
-types=(\'Spreadsheet\',\'Text\',\'Presentation\',\'Graphic\',\'DMS File\',\'PdfDocument\')\n
+types=(\'Spreadsheet\',\'Text\',\'Presentation\',\'Graphic\',\'DMS File\',\'PDF\')\n
 nrtypes=len(types)\n
 basecatdict={}\n
 for t in types:\n

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_notifyByEmail.xml

@@ -108,6 +108,7 @@ else:\n
 subject=subjecttpl % {\'name\':ob.getSourceReference()}\n
 \n
 msg=msgtpl % {\'url\':ob.absolute_url(),\'name\':ob.getSourceReference(), \'errmsg\':errmsg}\n
+\n
 mto=kw[\'address\']\n
 mfro=\'dms@dms.nexedi.com\' # this should be in preferences\n
 \n

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignment.xml

@@ -79,7 +79,7 @@
 # portal_type : portal type of object\n
 \n
 # must always return a list of dicts\n
-\n
+context.log(\'base_category_list\',base_category_list)\n
 category_list = []\n
 \n
 person_module = context.portal_url.getPortalObject().getDefaultModule(\'Person\')\n
@@ -112,7 +112,7 @@ for assignment in person_object.contentValues(filter={\'portal_type\': \'Assignm
       else:\n
         raise RuntimeError, "Error: \'%s\' property is required in order to update person security group"  % (base_category)\n
     category_list.append(category_dict)\n
-#context.log(category_list)\n
+context.log(category_list)\n
 return category_list\n
 
 
@@ -176,9 +176,9 @@ return category_list\n
                             <string>user_name</string>
                             <string>object</string>
                             <string>portal_type</string>
-                            <string>category_list</string>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>category_list</string>
                             <string>person_module</string>
                             <string>append</string>
                             <string>$append0</string>

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

@@ -425,8 +425,8 @@
                     <value>
                       <list>
                         <tuple>
-                          <string>Book Information</string>
-                          <string>Book Information</string>
+                          <string>Book</string>
+                          <string>Book</string>
                         </tuple>
                       </list>
                     </value>

bt5/erp5_dms/bt/revision

-372
+375
\ No newline at end of file

bt5/erp5_dms/bt/template_action_path_list

-Book Information | view
+Book | view
 DMS File | download
 DMS File | file_upload
 DMS File | history
@@ -17,6 +17,26 @@ Document Module | list_ui
 Document Module | sort_on
 Document Module | view
 Document Module | webdav
+Drawing | convert
+Drawing | create_snapshot
+Drawing | download
+Drawing | download_ooo
+Drawing | download_snapshot
+Drawing | export
+Drawing | file_upload
+Drawing | history
+Drawing | jump_to_all_related
+Drawing | jump_to_predecessor
+Drawing | jump_to_similar
+Drawing | jump_to_similarity_cloud
+Drawing | jump_to_successor
+Drawing | jump_to_wiki_predecessor
+Drawing | jump_to_wiki_successor
+Drawing | local_permission
+Drawing | metadata
+Drawing | print
+Drawing | related_document
+Drawing | view
 External Library File | books
 External Library File | history
 External Library File | metadata
@@ -28,26 +48,6 @@ External Web Page | history
 External Web Page | metadata
 External Web Page | spider
 External Web Page | view
-Graphic | convert
-Graphic | create_snapshot
-Graphic | download
-Graphic | download_ooo
-Graphic | download_snapshot
-Graphic | export
-Graphic | file_upload
-Graphic | history
-Graphic | jump_to_all_related
-Graphic | jump_to_predecessor
-Graphic | jump_to_similar
-Graphic | jump_to_similarity_cloud
-Graphic | jump_to_successor
-Graphic | jump_to_wiki_predecessor
-Graphic | jump_to_wiki_successor
-Graphic | local_permission
-Graphic | metadata
-Graphic | print
-Graphic | related_document
-Graphic | view
 Image Module | list_ui
 Image Module | sort_on
 Image Module | view
@@ -66,21 +66,21 @@ ImageDocument | metadata
 ImageDocument | print
 ImageDocument | related_document
 ImageDocument | view
-PdfDocument | download
-PdfDocument | file_upload
-PdfDocument | history
-PdfDocument | html_view
-PdfDocument | jump_to_all_related
-PdfDocument | jump_to_predecessor
-PdfDocument | jump_to_similar
-PdfDocument | jump_to_similarity_cloud
-PdfDocument | jump_to_successor
-PdfDocument | jump_to_wiki_predecessor
-PdfDocument | jump_to_wiki_successor
-PdfDocument | local_permission
-PdfDocument | metadata
-PdfDocument | related_document
-PdfDocument | view
+PDF | download
+PDF | file_upload
+PDF | history
+PDF | html_view
+PDF | jump_to_all_related
+PDF | jump_to_predecessor
+PDF | jump_to_similar
+PDF | jump_to_similarity_cloud
+PDF | jump_to_successor
+PDF | jump_to_wiki_predecessor
+PDF | jump_to_wiki_successor
+PDF | local_permission
+PDF | metadata
+PDF | related_document
+PDF | view
 Preference | dms_preferences
 Presentation | convert
 Presentation | create_snapshot

bt5/erp5_dms/bt/template_portal_type_allowed_content_type_list

 DMS File | Role Definition
 Document Module | DMS File
+Document Module | Drawing
 Document Module | External Library File
 Document Module | External Web Page
-Document Module | Graphic
-Document Module | PdfDocument
+Document Module | PDF
 Document Module | Presentation
 Document Module | Spreadsheet
 Document Module | Text
+Drawing | Role Definition
+External Library File | Book
 File | Role Definition
-Graphic | Role Definition
 Image Module | Image
 ImageDocument | Role Definition
-PdfDocument | Role Definition
+PDF | Role Definition
 Presentation | Role Definition
 Spreadsheet | Role Definition
 Text | Role Definition
\ No newline at end of file

bt5/erp5_dms/bt/template_portal_type_id_list

-Book Information
+Book
 DMS File
 Document Module
+Drawing
 External Library File
 External Source Module
 External Web Page
-Graphic
 Image Module
 ImageDocument
-PdfDocument
+PDF
 Presentation
 Role Definition
 Spreadsheet

bt5/erp5_dms/bt/template_portal_type_workflow_chain_list

@@ -2,25 +2,25 @@ DMS File | dms_file_interaction_workflow
 DMS File | document_publication_workflow
 DMS File | edit_workflow
 DMS File | local_permission_interaction_workflow
+Drawing | dms_file_interaction_workflow
+Drawing | document_publication_workflow
+Drawing | edit_workflow
+Drawing | local_permission_interaction_workflow
+Drawing | ooo_interaction_workflow
 External Library File | edit_workflow
 External Library File | external_document_interaction_workflow
 External Library File | external_document_publication_workflow
 External Web Page | edit_workflow
 External Web Page | external_document_interaction_workflow
 External Web Page | external_document_publication_workflow
-Graphic | dms_file_interaction_workflow
-Graphic | document_publication_workflow
-Graphic | edit_workflow
-Graphic | local_permission_interaction_workflow
-Graphic | ooo_interaction_workflow
 ImageDocument | dms_file_interaction_workflow
 ImageDocument | document_publication_workflow
 ImageDocument | edit_workflow
 ImageDocument | local_permission_interaction_workflow
-PdfDocument | dms_file_interaction_workflow
-PdfDocument | document_publication_workflow
-PdfDocument | edit_workflow
-PdfDocument | local_permission_interaction_workflow
+PDF | dms_file_interaction_workflow
+PDF | document_publication_workflow
+PDF | edit_workflow
+PDF | local_permission_interaction_workflow
 Presentation | dms_file_interaction_workflow
 Presentation | document_publication_workflow
 Presentation | edit_workflow