Skip to content

erp5
erp5
Commit db454648 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

- Fix BugLine_view. 

- Improved a bit the notification messages.
- Update few xml format

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22972 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a72982f2
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 53 deletions
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_view.xml
View file @ db454648
......@@ -42,12 +42,6 @@
<tuple/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string>Base_edit</string> </value>
......@@ -111,9 +105,7 @@
<value>
<list>
<string>my_title</string>
<string>my_causality_title</string>
<string>my_start_date</string>
<string>my_translated_simulation_state_title</string>
</list>
</value>
</item>
......@@ -123,6 +115,7 @@
<list>
<string>my_source_title</string>
<string>my_destination_title_list</string>
<string>my_translated_simulation_state_title</string>
</list>
</value>
</item>
......@@ -155,7 +148,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Bug Line</string> </value>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
......
bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow.xml
View file @ db454648
......@@ -21,6 +21,12 @@
<tuple/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>creation_guard</string> </key>
<value>
......
bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_checkConsistency.xml
View file @ db454648
......@@ -81,12 +81,6 @@ event.Base_checkConsistency()\n
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>state_change</string> </value>
......
bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/scripts/BugEvent_sendNotification.xml
View file @ db454648
......@@ -70,12 +70,10 @@
body = """\n
Reporter: %s\n
Date: %s\n
Follow Up: %s\n
\n
Bug Message:\n
\n
""" % (bug_message.getSourceTitle(\'\'), bug_message.getStartDate(\'\'), \n
bug_message.getFollowUpTitle(\'\'))\n
""" % (bug_message.getSourceTitle(\'\'), bug_message.getStartDate(\'\'))\n
\n
#XXX This does not support structured text format.\n
body += bug_message.getTextContent("") \n
......@@ -102,12 +100,10 @@ if bug.getSourceTitle() is not None:\n
body += """ Link: %s\n
Request Project: %s\n
Assigned Project: %s\n
Follow Up: %s\n
Description: \n
%s\n
""" % (bug.getAbsoluteUrl(), bug.getDestinationProjectTitle(\'\'), \n
bug.getSourceProjectTitle(\'\'), \n
\' / \'.join(bug.getFollowUpTitleList(\'\')), bug.getDescription(\'\'))\n
bug.getSourceProjectTitle(\'\'), bug.getDescription(\'\'))\n
\n
body += """\n
+---------------------- Messages Related -----------------------+\n
......@@ -142,12 +138,6 @@ portal.portal_notifications.sendMessage(sender=bug_message.getSourceValue(),\n
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>state_change</string> </value>
......
bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/Bug_sendNotification.xml
View file @ db454648
......@@ -69,16 +69,17 @@
bug = state_change["object"]\n
valid_transaction_list = ["confirm_action", "stop_action", \n
"deliver_action", "set_ready_action"]\n
"deliver_action", "set_ready_action" , "cancel_action"]\n
\n
message = [ h for h in state_change.getHistory() \\\n
if h[\'action\'] in valid_transaction_list]\n
\n
comment = ""\n
if len(message) > 0:\n
comment=message[-1]["comment"] \n
comment=message[-1]["comment"]\n
\n
line = bug.newContent(title="This bug was %s" % bug.getSimulationStateTitle(),\n
line = bug.newContent(title="Bug %s was %s" % (bug.getReference(),\n
bug.getSimulationStateTitle()),\n
portal_type="Bug Line",\n
text_content=comment)\n
\n
......@@ -100,12 +101,6 @@ line.start()\n
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>state_change</string> </value>
......
bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/delivered.xml
View file @ db454648
......@@ -73,18 +73,11 @@
</tuple>
</value>
</item>
<item>
<key> <string>Add Content Type Registrys</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>Add portal content</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
......
bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel.xml
View file @ db454648
......@@ -29,7 +29,7 @@
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string></string> </value>
<value> <string>Bug_sendNotification</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -51,7 +51,7 @@
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string>Bug_sendNotification</string> </value>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
bt5/erp5_forge/bt/revision
View file @ db454648
302
\ No newline at end of file
306
\ 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