Skip to content

erp5
erp5
Commit 06de7a8b authored by Jean-Paul Smets's avatar Jean-Paul Smets
Browse files
Options

Various bug fixes. Use of new document groups. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13353 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6ac1c8b0
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 17 deletions
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
View file @ 06de7a8b
......@@ -97,14 +97,13 @@ else:\n
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 @@ if wheres != []:\n
# 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
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml
View file @ 06de7a8b
......@@ -90,7 +90,7 @@ try:\n
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
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ContributionTool_newContent.xml
View file @ 06de7a8b
......@@ -90,8 +90,6 @@ if 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
\n
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashFunctionItemList.xml
View file @ 06de7a8b
......@@ -95,7 +95,10 @@ for i in range(1):\n
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
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashGroupItemList.xml
View file @ 06de7a8b
......@@ -95,7 +95,10 @@ for i in range(1):\n
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
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_hashSiteItemList.xml
View file @ 06de7a8b
......@@ -95,7 +95,10 @@ for i in range(1):\n
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
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewHTMLPreview.xml
View file @ 06de7a8b
......@@ -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>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getSearchableTypeList.xml → bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Site_getSearchableDocumentTypeList.xml
View file @ 06de7a8b
......@@ -68,7 +68,34 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return context.getPortalDocumentTypeList() + (\'Conference\', \'Project\') # XXX-JPS What is this hardcoded stuff ?\n
<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>
......@@ -117,8 +144,13 @@
<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>
......@@ -135,7 +167,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getSearchableTypeList</string> </value>
<value> <string>ERP5Site_getSearchableDocumentTypeList</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_spiderAndSetState.xml
View file @ 06de7a8b
......@@ -75,6 +75,7 @@ depending on whether refresh was successful.\n
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 @@ else:\n
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>
......@@ -106,6 +107,15 @@ context.reindexObject()\n
<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>
<value>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_spiderNow.xml
View file @ 06de7a8b
......@@ -74,7 +74,8 @@ Public interface to ExternalDocument_spiderAndSetState script.\n
\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>
......@@ -93,6 +94,14 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/view?portal
<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>
<value>
......@@ -119,6 +128,8 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/view?portal
<tuple>
<string>_getattr_</string>
<string>context</string>
<string>msg</string>
<string>dict</string>
</tuple>
</value>
</item>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/filefind.png.xml
View file @ 06de7a8b
......@@ -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>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/folder.png.xml
View file @ 06de7a8b
......@@ -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>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/webdav.png.xml
View file @ 06de7a8b
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7