From 50e4b8f0b8a3130c0a8044fcd0e9841b0acc5f94 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Tue, 6 Oct 2020 12:18:43 +0000
Subject: [PATCH] erp5_core/forge: activate action for ERP5JS
* update template tool configuration
* create working copy
* create skin folder
* throw away local changes
---
.../portal_types/Business%20Template/clean_vcs_bt.xml | 4 ++--
.../Business%20Template/create_skin_folder.xml | 4 ++--
.../Business%20Template/create_working_copy.xml | 4 ++--
.../erp5_vcs/BusinessTemplate_doCreateWorkingCopy.py | 5 ++---
.../erp5_vcs/BusinessTemplate_doCreateWorkingCopy.xml | 2 +-
.../portal_skins/erp5_vcs/BusinessTemplate_doVcsClean.py | 5 +++--
.../your_repository.xml | 2 +-
.../portal_types/Template%20Tool/update.xml | 8 +++++---
8 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/clean_vcs_bt.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/clean_vcs_bt.xml
index dbad964fbb..c46a70b35f 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/clean_vcs_bt.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/clean_vcs_bt.xml
@@ -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>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/create_skin_folder.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/create_skin_folder.xml
index f50a29259d..6a9837d433 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/create_skin_folder.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/create_skin_folder.xml
@@ -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>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/create_working_copy.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/create_working_copy.xml
index a128e513a0..31f0942ddf 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/create_working_copy.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/create_working_copy.xml
@@ -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>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doCreateWorkingCopy.py b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doCreateWorkingCopy.py
index 8812ba0c7d..4faa4f0da6 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doCreateWorkingCopy.py
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doCreateWorkingCopy.py
@@ -1,9 +1,8 @@
from Products.ERP5Type.Message import translateString
-form_results = context.BusinessTemplate_viewCreateWorkingCopy.validate_all(REQUEST)
-working_copy = form_results['your_repository']
+working_copy = repository
context.getVcsTool(path=working_copy).createBusinessTemplateWorkingCopy()
-return context.Base_redirect('BusinessTemplate_viewVcsStatus', keep_items=dict(
+return context.Base_redirect('view', keep_items=dict(
portal_status_message=translateString('Business Template Working Copy created')
))
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doCreateWorkingCopy.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doCreateWorkingCopy.xml
index 8d807895f2..169a547e0f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doCreateWorkingCopy.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doCreateWorkingCopy.xml
@@ -50,7 +50,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>REQUEST</string> </value>
+ <value> <string>repository=None, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsClean.py b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsClean.py
index cc14913b2f..22564b12b9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsClean.py
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsClean.py
@@ -1,4 +1,5 @@
context.getVcsTool().clean()
-context.REQUEST.set('portal_status_message', 'Working copy cleaned successfully.')
-return context.view()
+return context.Base_redirect('view', keep_items={
+ 'portal_status_message': 'Working copy cleaned successfully.'
+})
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewCreateWorkingCopy/your_repository.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewCreateWorkingCopy/your_repository.xml
index 06dfa96e4c..d16f666a82 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewCreateWorkingCopy/your_repository.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewCreateWorkingCopy/your_repository.xml
@@ -257,7 +257,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: context.getVcsTool().getWorkingCopyList()</string> </value>
+ <value> <string>python: [(x, x) for x in context.getVcsTool().getWorkingCopyList()]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/update.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/update.xml
index 637c7e2ba8..383d77b44b 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/update.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/update.xml
@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
- <string>action_type/object_exchange</string>
+ <string>action_type/object_jio_exchange</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
- <value> <string>object_exchange</string> </value>
+ <value> <string>object_jio_exchange</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>
--
2.30.9