[Erp5-report] r13352 - /erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Mar 12 13:40:37 CET 2007
Author: jp
Date: Mon Mar 12 13:40:28 2007
New Revision: 13352
URL: http://svn.erp5.org?rev=13352&view=rev
Log:
Various bug fixes. Use of new document groups.
Added:
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Site_getSearchableDocumentTypeList.xml
Modified:
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.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_newContent.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashFunctionItemList.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashGroupItemList.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashSiteItemList.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewHTMLPreview.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/filefind.png.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/folder.png.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/webdav.png.xml
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml?rev=13352&r1=13351&r2=13352&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml Mon Mar 12 13:40:28 2007
@@ -97,14 +97,13 @@
if params:\n
sstr = params.get(\'SearchableText\')\n
\n
-context.log(sstr)\n
if not sstr: return []\n
\n
args = context.parseSearchString(sstr)\n
\n
# if no portal type specified, take all\n
if not args.has_key(\'portal_type\') or args[\'portal_type\'] == ():\n
- args[\'portal_type\'] = context.Base_getSearchableTypeList()\n
+ args[\'portal_type\'] = context.getPortalDocumentTypeList()\n
\n
# process searching by category\n
cats = []\n
@@ -145,7 +144,6 @@
# now we search\n
# any language?\n
if args.get(\'language\') == \'0\': args.pop(\'language\')\n
-context.log(\'SEARCH:\',args)\n
res = context.portal_catalog(**args)\n
\n
# user wants only his documents\n
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=13352&r1=13351&r2=13352&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 12 13:40:28 2007
@@ -90,7 +90,7 @@
except AttributeError:\n
txt = \'\'\n
\n
-argument_names = (\'SearchableText\', \'SearchableText_any\', \'SearchableText_all\', \'SearchableText_phrase\')\n
+argument_names = (\'advanced_search_text\', \'title\', \'reference\', \'SearchableText\', \'SearchableText_any\', \'SearchableText_all\', \'SearchableText_phrase\')\n
\n
# a quick hack because sometimes we get a list\n
params = [selection.params.get(name, \'\') for name in argument_names]\n
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=13352&r1=13351&r2=13352&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 12 13:40:28 2007
@@ -89,8 +89,6 @@
del(kw[\'portal_type\'])\n
\n
doc = context.portal_contributions.newContent(file=file, **kw)\n
-\n
-context.log(doc.getId(), doc.getRelativeUrl())\n
\n
msg = translateString("${portal_type} created successfully.", mapping = {\'portal_type\':doc.getPortalType()})\n
return context.Base_redirect(\'view\', keep_items = {\'portal_status_message\':msg})\n
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashFunctionItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashFunctionItemList.xml?rev=13352&r1=13351&r2=13352&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashFunctionItemList.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashFunctionItemList.xml Mon Mar 12 13:40:28 2007
@@ -95,7 +95,10 @@
z += 1\n
sub_field_list.append(new_dict)\n
\n
-section_list = context.getFunctionList()\n
+# WARNING This code is very dangerous and ad hoc\n
+# But it was the only way to make parallel list field\n
+# work in this case \n
+section_list = context.aq_parent.aq_parent.getFunctionList()\n
section_list.reverse()\n
for value in section_list:\n
new_dict = default_sub_field_property_dict.copy()\n
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashGroupItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashGroupItemList.xml?rev=13352&r1=13351&r2=13352&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashGroupItemList.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashGroupItemList.xml Mon Mar 12 13:40:28 2007
@@ -95,7 +95,10 @@
z += 1\n
sub_field_list.append(new_dict)\n
\n
-section_list = context.getGroupList()\n
+# WARNING This code is very dangerous and ad hoc\n
+# But it was the only way to make parallel list field\n
+# work in this case \n
+section_list = context.aq_parent.aq_parent.getGroupList()\n
section_list.reverse()\n
for value in section_list:\n
new_dict = default_sub_field_property_dict.copy()\n
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashSiteItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashSiteItemList.xml?rev=13352&r1=13351&r2=13352&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashSiteItemList.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashSiteItemList.xml Mon Mar 12 13:40:28 2007
@@ -95,7 +95,10 @@
z += 1\n
sub_field_list.append(new_dict)\n
\n
-section_list = context.getSiteList()\n
+# WARNING This code is very dangerous and ad hoc\n
+# But it was the only way to make parallel list field\n
+# work in this case \n
+section_list = context.aq_parent.aq_parent.getSiteList()\n
section_list.reverse()\n
for value in section_list:\n
new_dict = default_sub_field_property_dict.copy()\n
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewHTMLPreview.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewHTMLPreview.xml?rev=13352&r1=13351&r2=13352&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewHTMLPreview.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewHTMLPreview.xml Mon Mar 12 13:40:28 2007
@@ -78,7 +78,7 @@
<value>
<dictionary>
<item>
- <key> <string>bottom</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>html_representation</string>
@@ -86,7 +86,7 @@
</value>
</item>
<item>
- <key> <string>left</string> </key>
+ <key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
@@ -102,7 +102,7 @@
</value>
</item>
<item>
- <key> <string>right</string> </key>
+ <key> <string>right</string> </key>
<value>
<list>
<string>my_reference</string>
Added: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Site_getSearchableDocumentTypeList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Site_getSearchableDocumentTypeList.xml?rev=13352&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Site_getSearchableDocumentTypeList.xml (added)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Site_getSearchableDocumentTypeList.xml Mon Mar 12 13:40:28 2007
@@ -1,0 +1,181 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.PythonScripts.PythonScript</string>
+ <string>PythonScript</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>"""\n
+ This method returns the list of searchable types\n
+ from a document management point of view.\n
+\n
+ The result is translated and cached.\n
+\n
+ NOTE: some hardcoded values need to be moved\n
+ to preferences\n
+"""\n
+def getSearchableTypeList(language):\n
+ type_list = list(context.getPortalDocumentTypeList())\n
+ # We add here hardcoded types\n
+ types_tools = context.portal_types\n
+ type_ids = types_tools.objectIds()\n
+ if \'Query\' in type_ids:\n
+ type_list.append(\'Query\')\n
+ if \'Project\' in type_ids:\n
+ type_list.append(\'Project\')\n
+ if \'Conference\' in type_ids:\n
+ type_list.append(\'Conference\')\n
+ type_list.sort()\n
+ return type_list\n
+\n
+from Products.ERP5Type.Cache import CachingMethod\n
+language = context.Localizer.get_selected_language()\n
+method = CachingMethod(getSearchableTypeList, (\'WebSite_getSearchableTypeList\'))\n
+\n
+return method(language)\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>getSearchableTypeList</string>
+ <string>Products.ERP5Type.Cache</string>
+ <string>CachingMethod</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>language</string>
+ <string>method</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>ERP5Site_getSearchableDocumentTypeList</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
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=13352&r1=13351&r2=13352&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 12 13:40:28 2007
@@ -75,6 +75,7 @@
This is called from interaction workflow, upon every edit\n
can be called regularly from portal_alarms, or something like that.\n
"""\n
+context.resetTopObject()\n
\n
if context.getUrlProtocol() is None or context.getUrlString() is None:\n
context.log("Incomplete url in %s" % context.getRelativeUrl(),context.getQualifiedUrl())\n
@@ -83,9 +84,9 @@
res = context.spiderSource()\n
\n
if res and context.getSimulationState() == \'draft\':\n
- context.getPortalObject().portal_workflow.doActionFor(context, \'publish_action\')\n
+ context.publish()\n
if not res and context.getSimulationState() == \'public\':\n
- context.getPortalObject().portal_workflow.doActionFor(context, \'retract_action\')\n
+ context.retract()\n
\n
context.reindexObject()\n
</string> </value>
@@ -105,6 +106,15 @@
<item>
<key> <string>_params</string> </key>
<value> <string>*args,**kwargs</string> </value>
+ </item>
+ <item>
+ <key> <string>_proxy_roles</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
</item>
<item>
<key> <string>errors</string> </key>
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=13352&r1=13351&r2=13352&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 12 13:40:28 2007
@@ -74,7 +74,8 @@
\n
context.resetTopObject()\n
context.ExternalDocument_spiderAndSetState()\n
-return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/view?portal_status_message=Done\')\n
+msg = context.Base_translateString(\'Done\')\n
+return context.Base_redirect(\'view\', keep_items=dict(portal_status_message=msg))\n
</string> </value>
</item>
<item>
@@ -92,6 +93,14 @@
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>_proxy_roles</string> </key>
+ <value>
+ <tuple>
+ <string>Assignor</string>
+ </tuple>
+ </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -119,6 +128,8 @@
<tuple>
<string>_getattr_</string>
<string>context</string>
+ <string>msg</string>
+ <string>dict</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/filefind.png.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/filefind.png.xml?rev=13352&r1=13351&r2=13352&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/filefind.png.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/filefind.png.xml Mon Mar 12 13:40:28 2007
@@ -12,6 +12,10 @@
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>_Cacheable__manager_id</string> </key>
+ <value> <string>style_cache</string> </value>
+ </item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/folder.png.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/folder.png.xml?rev=13352&r1=13351&r2=13352&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/folder.png.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/folder.png.xml Mon Mar 12 13:40:28 2007
@@ -12,6 +12,10 @@
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>_Cacheable__manager_id</string> </key>
+ <value> <string>style_cache</string> </value>
+ </item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/webdav.png.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/webdav.png.xml?rev=13352&r1=13351&r2=13352&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/webdav.png.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/webdav.png.xml Mon Mar 12 13:40:28 2007
@@ -12,6 +12,10 @@
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>_Cacheable__manager_id</string> </key>
+ <value> <string>style_cache</string> </value>
+ </item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
More information about the Erp5-report
mailing list