Skip to content

erp5
erp5
Commit 2ff87239 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

* changed security settings on counter_date workflow 

* do not use lstrip in order to remove the beginning of a string

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12581 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent cfa916d1
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 125 deletions
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_checkResourceCategoryList.xml
View file @ 2ff87239
......@@ -71,7 +71,7 @@
<value> <string>def getResourceVariationCategory():\n
pass\n
\n
if variation != \'variation/not_defined\' and variation.lstrip(\'variation/\') not in resource_object.getVariationList():\n
if variation != \'variation/not_defined\' and variation.replace(\'variation/\',\'\') not in resource_object.getVariationList():\n
variation_not_defined = 1\n
break\n
</string> </value>
......@@ -102,7 +102,7 @@ if variation != \'variation/not_defined\' and variation.lstrip(\'variation/\') n
<key> <string>errors</string> </key>
<value>
<tuple>
<string>\'break\' outside loop (/baobab/portal_skins/erp5_banking_core/CashDetail_checkResourceCategoryList, 6)</string>
<string>\'break\' outside loop (Script (Python), 6)</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml
View file @ 2ff87239
......@@ -195,11 +195,11 @@ for resource_id in per_resource_dict.keys():\n
variation = variation[\'variation\']\n
# check if variation exist for the resource\n
if column_base_category == "variation":\n
if variation != \'variation/not_defined\' and variation.lstrip(\'variation/\') not in resource_object.getVariationList():\n
if variation != \'variation/not_defined\' and variation.replace(\'variation/\',\'\') not in resource_object.getVariationList():\n
variation_not_defined = 1\n
break\n
# for the letter, if coin, must always be not_defined\n
if letter != \'emission_letter/not_defined\' and letter.lstrip(\'emission_letter/\') not in resource_object.getEmissionLetterList():\n
if letter != \'emission_letter/not_defined\' and letter.replace(\'emission_letter/\',\'\') not in resource_object.getEmissionLetterList():\n
old_letter = letter\n
letter = \'emission_letter/not_defined\'\n
# replace key in per_resource_dict\n
......@@ -288,7 +288,7 @@ if variation_not_defined:\n
if len(old_line)>0:\n
for object_list in old_line:\n
context.deleteContent(object_list.getId())\n
message = N_("$title doesn\'t exist for $variation", mapping = {\'title\':resource_object.getTranslatedTitle(), \'variation\':variation.lstrip(\'variation/\')})\n
message = N_("$title doesn\'t exist for $variation", mapping = {\'title\':resource_object.getTranslatedTitle(), \'variation\':variation.replace(\'variation/\',\'\')})\n
redirect_url = \'%s/view?%s\' % ( context.absolute_url()\n
, "portal_status_message=%s" %message\n
)\n
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/worklists/draft.xml deleted 100644 → 0
View file @ cfa916d1
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Worklists</string>
<string>WorklistDefinition</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>global</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string>Drafts To Validate (%(count)s)</string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
Base_viewWorklist?simulation_state=draft&portal_type=Check&reset=1
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>draft</string> </value>
</item>
<item>
<key> <string>var_matches</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Persistence</string>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_container</string> </key>
<value>
<dictionary>
<item>
<key> <string>check_payment_state</string> </key>
<value>
<tuple>
<string>draft</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<tuple>
<string>Check</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_state</string> </key>
<value>
<tuple>
<string>draft</string>
</tuple>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml
View file @ 2ff87239
......@@ -76,16 +76,14 @@
<tuple>
<string>Assignor</string>
<string>Manager</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
<item>
<key> <string>Modify portal content</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......@@ -94,6 +92,7 @@
<tuple>
<string>Assignor</string>
<string>Manager</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml
View file @ 2ff87239
......@@ -76,7 +76,7 @@
<tuple>
<string>Assignor</string>
<string>Manager</string>
<string>Member</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
......@@ -84,7 +84,6 @@
<key> <string>Modify portal content</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
......@@ -95,7 +94,7 @@
<tuple>
<string>Assignor</string>
<string>Manager</string>
<string>Member</string>
<string>Reviewer</string>
</tuple>
</value>
</item>
......
bt5/erp5_banking_core/bt/revision
View file @ 2ff87239
120
\ No newline at end of file
122
\ No newline at end of file
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