Skip to content

erp5
erp5
Commit e559ecd5 authored by Romain Courteaud's avatar Romain Courteaud
4 Browse files
Options

[erp5_crm] Activate actions for ERP5JS

parent 5c3616ab
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 30 deletions
bt5/erp5_crm/ActionTemplateItem/portal_types/Campaign/new_event.xml
View file @ e559ecd5
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_action</string>
<string>action_type/object_jio_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_action</string> </value>
<value> <string>object_jio_action</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......
bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting/create_event_from_event_path.xml
View file @ e559ecd5
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_action</string>
<string>action_type/object_jio_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_action</string> </value>
<value> <string>object_jio_action</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......
bt5/erp5_crm/ActionTemplateItem/portal_types/Meeting/new_event.xml
View file @ e559ecd5
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_action</string>
<string>action_type/object_jio_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_action</string> </value>
<value> <string>object_jio_action</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......
bt5/erp5_crm/ActionTemplateItem/portal_types/Organisation/add_event.xml
View file @ e559ecd5
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_action</string>
<string>action_type/object_jio_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_action</string> </value>
<value> <string>object_jio_action</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......
bt5/erp5_crm/ActionTemplateItem/portal_types/Person%20Module/create_event_list.xml
View file @ e559ecd5
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_action</string>
<string>action_type/object_jio_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_action</string> </value>
<value> <string>object_jio_action</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -32,7 +32,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......
bt5/erp5_crm/ActionTemplateItem/portal_types/Person/add_event.xml
View file @ e559ecd5
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_action</string>
<string>action_type/object_jio_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_action</string> </value>
<value> <string>object_jio_action</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......
bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/new_event.xml
View file @ e559ecd5
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_action</string>
<string>action_type/object_jio_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_action</string> </value>
<value> <string>object_jio_action</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......
bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/new_event.xml
View file @ e559ecd5
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_action</string>
<string>action_type/object_jio_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_action</string> </value>
<value> <string>object_jio_action</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
......
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_addEvent.py
View file @ e559ecd5
......@@ -85,4 +85,4 @@ if batch_mode:
message = portal.Base_translateString('New event created.')
event.Base_redirect(keep_items={'portal_status_message': message})
return event.Base_redirect(keep_items={'portal_status_message': message})
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_newEvent.py
View file @ e559ecd5
......@@ -57,5 +57,6 @@ if batch_mode:
portal_status_message = translateString("Created and associated ${count} new events to the selected ticket.",
mapping=dict(count=count))
context.Base_redirect(form_id, keep_items = dict(portal_status_message=portal_status_message,
selection_name=selection_name), **kw)
kw['keep_items'] = dict(portal_status_message=portal_status_message,
selection_name=selection_name)
return context.Base_redirect(form_id, **kw)
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_updateNewEventDialog.py
View file @ e559ecd5
......@@ -30,10 +30,10 @@ if notification_message:
# XXX this relies on formulator internals, we force the variables in request and
# re-render the form.
request = container.REQUEST
request.set('your_notification_message', '')
request.set('your_title', title)
request.set('your_text_content', temp_event.getTextContent())
request.set('your_content_type', temp_event.getContentType())
request.set('your_resource', temp_event.getResource())
request.form['your_notification_message'] = ''
request.form['your_title'] = temp_event.getTitle()
  • Jérome Perrin @jerome ·
    Owner

    @kazuhiko @romain this changed from title to temp_event.getTitle() here, but in 3125590f we use again title. It seems to me this causes different behaviour in ERP5JS and in erp5_xhtml_style

    Edited by Jérome Perrin
  • Kazuhiko Shiozaki @kazuhiko ·
    Owner

    oops, I fixed my change at 57bb2836.

    Edited by Kazuhiko Shiozaki
Please register or sign in to reply
request.form['your_text_content'] = temp_event.getTextContent()
request.form['your_content_type'] = temp_event.getContentType()
request.form['your_resource'] = temp_event.getResource()
return getattr(context, dialog_id)()
return context.Base_renderForm(dialog_id)
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