[Erp5-report] r13684 - in /erp5/trunk/bt5/erp5_dms: ActionTemplateItem/portal_types/Present...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Mar 26 23:00:21 CEST 2007
Author: jp
Date: Mon Mar 26 22:59:46 2007
New Revision: 13684
URL: http://svn.erp5.org?rev=13684&view=rev
Log:
More support for hasBaseData. Removal of External Web Page (continued). Some smart behaviour in property disovery when title contains mirrosoft.
Modified:
erp5/trunk/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/export.xml
erp5/trunk/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
erp5/trunk/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/External%20Source%20Module.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_countMyContentList.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_getMyContentList.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_newContent.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPropertyDictFromContent.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_spiderAndSetState.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_spiderNow.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_convertToBase.xml
erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/public.xml
erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/released.xml
erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/external_document_interaction_workflow.xml
erp5/trunk/bt5/erp5_dms/bt/revision
erp5/trunk/bt5/erp5_dms/bt/template_action_path_list
erp5/trunk/bt5/erp5_dms/bt/template_portal_type_allowed_content_type_list
Modified: erp5/trunk/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/export.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/export.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/export.xml (original)
+++ erp5/trunk/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/export.xml Mon Mar 26 22:59:46 2007
@@ -102,7 +102,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python:object.hasOOFile()</string> </value>
+ <value> <string>python:object.hasBaseData()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml (original)
+++ erp5/trunk/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml Mon Mar 26 22:59:46 2007
@@ -22,7 +22,8 @@
<item>Image</item>
</portal_type>
<portal_type id="External Source Module">
- <item>External Web Page</item>
+ <item>RSS Feed</item>
+ <item>URL Crawler</item>
</portal_type>
<portal_type id="File">
<item>Role Definition</item>
Modified: erp5/trunk/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/External%20Source%20Module.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/External%2520Source%2520Module.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/External%20Source%20Module.xml (original)
+++ erp5/trunk/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/External%20Source%20Module.xml Mon Mar 26 22:59:46 2007
@@ -100,6 +100,10 @@
<value> <string></string> </value>
</item>
<item>
+ <key> <string>permission</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>property_sheet_list</string> </key>
<value>
<tuple/>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml Mon Mar 26 22:59:46 2007
@@ -86,7 +86,7 @@
maxlines = 5\n
\n
try:\n
- txt = brain.getObject().getTextContent() or \'\'\n
+ txt = context.asText() or \'\'\n
except AttributeError:\n
txt = \'\'\n
\n
@@ -124,6 +124,12 @@
</item>
<item>
<key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
<value>
<none/>
</value>
@@ -162,6 +168,7 @@
<string>trail</string>
<string>maxlines</string>
<string>_getattr_</string>
+ <string>context</string>
<string>txt</string>
<string>AttributeError</string>
<string>argument_names</string>
@@ -174,7 +181,6 @@
<string>hasattr</string>
<string>search_string</string>
<string>_getitem_</string>
- <string>context</string>
<string>search_argument_list</string>
<string>search_words</string>
<string>None</string>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_countMyContentList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_countMyContentList.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_countMyContentList.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_countMyContentList.xml Mon Mar 26 22:59:46 2007
@@ -99,6 +99,12 @@
</value>
</item>
<item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>_params</string> </key>
<value> <string>user=None,**kw</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_getMyContentList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_getMyContentList.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_getMyContentList.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_getMyContentList.xml Mon Mar 26 22:59:46 2007
@@ -99,6 +99,12 @@
</value>
</item>
<item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>_params</string> </key>
<value> <string>user=None, **kw</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_newContent.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_newContent.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_newContent.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_newContent.xml Mon Mar 26 22:59:46 2007
@@ -112,6 +112,12 @@
</item>
<item>
<key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
<value>
<none/>
</value>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPropertyDictFromContent.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPropertyDictFromContent.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPropertyDictFromContent.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPropertyDictFromContent.xml Mon Mar 26 22:59:46 2007
@@ -105,6 +105,13 @@
# return result\n
\n
ptype = ptype or context.getPortalType()\n
+\n
+# Erase titles which are meaningless\n
+title = result.get(\'title\', None)\n
+if title:\n
+ if title.startswith(\'Microsoft Word\'):\n
+ # Probably a file generated from MS Word\n
+ del result[\'title\']\n
\n
return result\n
</string> </value>
@@ -173,6 +180,7 @@
<string>p</string>
<string>None</string>
<string>contributor</string>
+ <string>title</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_spiderAndSetState.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_spiderAndSetState.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_spiderAndSetState.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_spiderAndSetState.xml Mon Mar 26 22:59:46 2007
@@ -104,6 +104,12 @@
</value>
</item>
<item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>_params</string> </key>
<value> <string>*args,**kwargs</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_spiderNow.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_spiderNow.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_spiderNow.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_spiderNow.xml Mon Mar 26 22:59:46 2007
@@ -91,6 +91,12 @@
</value>
</item>
<item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_convertToBase.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_convertToBase.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_convertToBase.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_convertToBase.xml Mon Mar 26 22:59:46 2007
@@ -91,6 +91,12 @@
</value>
</item>
<item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>_params</string> </key>
<value> <string>form_id</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/public.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/public.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/public.xml (original)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/public.xml Mon Mar 26 22:59:46 2007
@@ -44,6 +44,8 @@
<string>archive_action</string>
<string>hide</string>
<string>hide_action</string>
+ <string>reject</string>
+ <string>reject_action</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/released.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/released.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/released.xml (original)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/released.xml Mon Mar 26 22:59:46 2007
@@ -46,6 +46,8 @@
<string>hide_action</string>
<string>publish</string>
<string>publish_action</string>
+ <string>reject</string>
+ <string>reject_action</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/external_document_interaction_workflow.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/external_document_interaction_workflow.xml?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/external_document_interaction_workflow.xml (original)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/external_document_interaction_workflow.xml Mon Mar 26 22:59:46 2007
@@ -25,6 +25,12 @@
</value>
</item>
<item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>groups</string> </key>
<value>
<tuple/>
Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Mon Mar 26 22:59:46 2007
@@ -1,1 +1,1 @@
-607
+608
Modified: erp5/trunk/bt5/erp5_dms/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/template_action_path_list?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/template_action_path_list (original)
+++ erp5/trunk/bt5/erp5_dms/bt/template_action_path_list Mon Mar 26 22:59:46 2007
@@ -30,11 +30,6 @@
Drawing | view
Drawing | web_view
External Source Module | view
-External Web Page | externalsite_subpages
-External Web Page | history
-External Web Page | metadata
-External Web Page | spider
-External Web Page | view
File | file_upload
File | jump_to_all_related
File | jump_to_predecessor
Modified: erp5/trunk/bt5/erp5_dms/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/template_portal_type_allowed_content_type_list?rev=13684&r1=13683&r2=13684&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/template_portal_type_allowed_content_type_list (original)
+++ erp5/trunk/bt5/erp5_dms/bt/template_portal_type_allowed_content_type_list Mon Mar 26 22:59:46 2007
@@ -14,7 +14,8 @@
Document Module | Text
Drawing | Image
Drawing | Role Definition
-External Source Module | External Web Page
+External Source Module | RSS Feed
+External Source Module | URL Crawler
File | Role Definition
File | Role Definition
Image Module | Image
More information about the Erp5-report
mailing list