Commit 35ba51d4 authored by Roque's avatar Roque

erp5_officejs: only show one view "View" when portal type has several

parent 3d350c00
...@@ -39,12 +39,25 @@ ...@@ -39,12 +39,25 @@
} }
function filterViews(views_dict, app_view, default_view) { function filterViews(views_dict, app_view, default_view) {
//TODO: there must be only one "View" action (title = "View") // there must be only one "View" action (title = "View")
// this is for scenarios were the portal type has several "View" (like view, jio_view, custom_view) // this is for scenarios were the portal type has several "View" (like view, jio_view, custom_view)
// priority: app_view ; default_view ; other (reference=view) // priority: app_view ; default_view ; other
// if views_dict contains app_view -> remove all "View" entries var only_view, key,
// else if contains default_view -> remove all "View" entries view_list = Object.keys(views_dict).map(function (key) {
// else get first "View" and remove all other "View" entries if (views_dict[key].title === "View") { return key; }
});
if (view_list.includes(app_view)) {
only_view = app_view;
} else if (view_list.includes(default_view)) {
only_view = default_view;
} else {
only_view = view_list[0];
}
for (key in view_list) {
if (view_list[key] !== only_view) {
delete views_dict[view_list[key]];
}
}
return views_dict; return views_dict;
} }
...@@ -95,7 +108,8 @@ ...@@ -95,7 +108,8 @@
}) })
.declareMethod("getAllViewsAndActions", function (portal_type, options) { .declareMethod("getAllViewsAndActions", function (portal_type, options) {
//TODO for now this takes also views. Views should be handle in another gadget like "..tab_office.js" // TODO views are also listed here
// should views be handled in another gadget like "..tab_office.js" ?
var gadget = this, var gadget = this,
action_info_dict = {views: {}, actions: {}}, action_info_dict = {views: {}, actions: {}},
//TODO use Query to avoid strings //TODO use Query to avoid strings
......
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>976.31395.21170.7816</string> </value> <value> <string>976.32499.44430.52411</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1560871889.71</float> <float>1560938148.99</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
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