[MERGE] forward port branch saas-12 up to 16d65a8

4 files changed, 17 insertions, 3 deletions

diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 6e072333d6b..4ce7ed6dbf3 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -142,7 +142,7 @@ var FieldMany2One = common.AbstractField.extend(common.CompletionFieldMixin, com
             }
             var context = self.build_context().eval();
             var model_obj = new Model(self.field.relation);
-            model_obj.call('get_formview_id', [self.get("value"), context]).then(function(view_id){
+            model_obj.call('get_formview_id', [[self.get("value")], context]).then(function(view_id){
                 var pop = new common.FormViewDialog(self, {
                     res_model: self.field.relation,
                     res_id: self.get("value"),
@@ -362,7 +362,7 @@ var FieldMany2One = common.AbstractField.extend(common.CompletionFieldMixin, com
     execute_formview_action: function() {
         var self = this;
         var context = self.build_context().eval();
-        (new Model(self.field.relation)).call('get_formview_action', [self.get("value"), context]).then(function(action) {
+        (new Model(self.field.relation)).call('get_formview_action', [[self.get("value")], context]).then(function(action) {
             self.do_action(action);
         });
     },
diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js
index 91f15de1a04..234edb9e41e 100644
--- a/addons/web/static/src/js/views/list_view_editable.js
+++ b/addons/web/static/src/js/views/list_view_editable.js
@@ -432,6 +432,11 @@ ListView.include(/** @lends instance.web.ListView# */{
             field.$el.addClass('o_row_handle');
         }
 
+        // Workaround a bug in safari mobile where the inputs are not displayed correctly.
+        if (window.getComputedStyle(field.el.parentElement).webkitOverflowScrolling) {
+            field.el.style.zIndex = 1;
+        }
+
         function position_element($el, pos) {
             $el.addClass('o_temp_visible').css({top: 0, left: 0}).position({
                 my: pos,
diff --git a/addons/web/static/src/js/web_client.js b/addons/web/static/src/js/web_client.js
index 99237dccc6c..5fc1f3f2796 100644
--- a/addons/web/static/src/js/web_client.js
+++ b/addons/web/static/src/js/web_client.js
@@ -62,7 +62,7 @@ return AbstractWebClient.extend({
         var company = session.company_id;
         var img = session.url('/web/binary/company_logo' + '?db=' + session.db + (company ? '&company=' + company : ''));
         this.$('.oe_logo img').attr('src', '').attr('src', img);
-        this.$('.oe_logo_edit').toggleClass('oe_logo_edit_admin', session.uid === 1);
+        this.$('.oe_logo_edit').toggleClass('oe_logo_edit_admin', session.is_superuser);
     },
     logo_edit: function(ev) {
         var self = this;
diff --git a/addons/web/static/src/less/list_view.less b/addons/web/static/src/less/list_view.less
index a8b4130269c..e335fc2ca82 100644
--- a/addons/web/static/src/less/list_view.less
+++ b/addons/web/static/src/less/list_view.less
@@ -204,6 +204,15 @@
     }
 }
 
+// Workaround a bug in safari mobile where the inputs are not displayed correctly.
+.modal {
+    .o_list_editable {
+        .o_form_view.o_list_editable_form {
+            -webkit-overflow-scrolling: auto;
+        }
+    }
+}
+
 // Buttons in ControlPanel
 .o_list_buttons {
     .o_list_button_save, .o_list_button_discard {