Merge lp:~fabien-morin/unifield-web/fm-us-3203 into lp:unifield-web

[jftempo]

[lp:~fabien-morin/unifield-web/fm-us-3203]

4852. By Fabien MORIN on 2017-07-31

US-3203 [FIX] revert previous change, do the submit form with the new view only
if the new view is different from the current or can not be read.

4853. By Fabien MORIN on 2017-07-31

US-3203 [FIX] missing parenthesis

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2017-04-19 14:36:32 +0000
+++ addons/openerp/static/javascript/form.js	2017-07-31 15:16:52 +0000
@@ -178,10 +178,12 @@
             openobject.dom.get('_terp_id').value = ids[0];
         }
     }
-    submit_form(get_form_action('switch', {
-        '_terp_source': src,
-        '_terp_source_view_type': view_type
-    }));
+    if (!openobject.dom.get('_terp_view_type') || openobject.dom.get('_terp_view_type').value != view_type) {
+        submit_form(get_form_action('switch', {
+            '_terp_source': src,
+            '_terp_source_view_type': view_type
+        }));
+    }
 }
 
 function validate_required(form){

=== modified file 'addons/openerp/widgets/templates/sidebar.mako'
--- addons/openerp/widgets/templates/sidebar.mako	2016-12-13 10:44:54 +0000
+++ addons/openerp/widgets/templates/sidebar.mako	2017-07-31 15:16:52 +0000
@@ -1,7 +1,7 @@
 <%def name="sidebox_action_item(item, model, submenu, icon)">
     % if submenu != 1:
     	<li action_id="${item['id']}" relation="${model}" domain="${item.get('domain')}" empty_ids="${item.get('empty_ids') and 1 or 0}"
-    	   context="${item.get('context')}" onclick="validate_action(this, do_action)">
+    	   context="${item.get('context')}" onclick="validate_action(this, do_action);">
             % if icon:
                 <img src="${icon}" alt=""/>
             % endif