Commit 22b7246e authored by Roque's avatar Roque Committed by Roque

erp5_officejs: change module views categories

- views/actions meant for officejs should use "object_jio_x" categories to avoid conflicts with erp5js
- using object_jio_search instead of common object_jio_view because the base form for rendering depends on the category (form_list, form_dialog, form_view, etc)
- changes are also in bts officejs_jquery_app and officejs_ooffice
parent e3d5778b
Pipeline #7068 failed with stage
in 0 seconds
......@@ -16,7 +16,7 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_list</string>
<string>action_type/object_jio_search</string>
</tuple>
</value>
</item>
......
......@@ -24,7 +24,7 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_list</string>
<string>action_type/object_jio_search</string>
</tuple>
</value>
</item>
......
......@@ -24,7 +24,7 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_list</string>
<string>action_type/object_jio_search</string>
</tuple>
</value>
</item>
......
......@@ -24,7 +24,7 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_list</string>
<string>action_type/object_jio_search</string>
</tuple>
</value>
</item>
......
......@@ -6,7 +6,7 @@
// TODO: check if there are other categories that are 'views'
// and find a less hardcoded way to get this
var view_categorie_list = ["object_view", "object_jio_view",
"object_web_view", "object_list"];
"object_web_view", "object_jio_search"];
function filterViewList(views_dict, app_view, default_view) {
// there must be only one "View" action (title = "View")
......@@ -96,7 +96,7 @@
form_type,
action_category = form_definition.action_type;
switch (action_category) {
case 'object_list':
case 'object_jio_search':
form_type = 'list';
child_gadget_url = 'gadget_erp5_pt_form_list.html';
break;
......
......@@ -269,7 +269,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>979.63531.55269.9250</string> </value>
<value> <string>980.16928.56199.10649</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -287,7 +287,7 @@
</tuple>
<state>
<tuple>
<float>1574423791.17</float>
<float>1575473624.38</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -24,7 +24,7 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_list</string>
<string>action_type/object_jio_search</string>
</tuple>
</value>
</item>
......
......@@ -16,7 +16,7 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_list</string>
<string>action_type/object_jio_search</string>
</tuple>
</value>
</item>
......
......@@ -16,7 +16,7 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_list</string>
<string>action_type/object_jio_search</string>
</tuple>
</value>
</item>
......
......@@ -16,7 +16,7 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_list</string>
<string>action_type/object_jio_search</string>
</tuple>
</value>
</item>
......
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