Merge lp:~jfb-tempo-consulting/unifield-web/us-4198 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/static/css/screen.css'
--- addons/openerp/static/css/screen.css	2017-09-20 15:17:48 +0000
+++ addons/openerp/static/css/screen.css	2018-05-17 08:40:34 +0000
@@ -2023,6 +2023,32 @@
     text-shadow: #fff 0 1px 0;
 }
 
+#contextmenu ul,#contextmenu form {
+    list-style: none;
+    margin: 6px 5px 6px 10px;
+    padding: 0;
+}
+
+#contextmenu li,#contextmenu label {
+    margin: 0 0 5px;
+    color: #5b5b5b;
+}
+
+#contextmenu .sideheader-a {
+    position: relative;
+    padding-right: 2px;
+    border-top: 0px;
+    border-bottom: 0px;
+    background: url();
+}
+
+#contextmenu .sideheader-a h2 {
+    text-shadow: none;
+    color: #FFF;
+    border-bottom: 1px solid #FFF;
+    font-size: 10px;
+}
+
 #sidebar label {
     margin: 5px 0 0;
 }

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2018-03-02 14:45:07 +0000
+++ addons/openerp/static/javascript/form.js	2018-05-17 08:40:34 +0000
@@ -1172,6 +1172,23 @@
     });
 }
 
+function makeListContextMenu(rec_id, init_value){
+        sd = $('#sidebar');
+
+        var $menu = jQuery('#contextmenu');
+        $menu.attr('rec_id', rec_id);
+        $menu.attr('init_value', init_value);
+        $menu.empty().append(
+            jQuery('<table cellpadding="0" cellspacing="0">').append(sd.html()));
+
+        var menu_width = $menu.width();
+        var body_width = jQuery(document.body).width();
+        if (parseInt($menu.css("left")) + menu_width > body_width) {
+            $menu.css({left: body_width - menu_width - 10 + 'px'});
+        }
+        showContextMenu();
+}
+
 function showContextMenu(){
     var $menu = jQuery('#contextmenu');
     var $ifrm = jQuery('#contextmenu_frm');
@@ -1189,6 +1206,11 @@
 
 function hideContextMenu(){
     jQuery('#contextmenu, #contextmenu_frm').hide();
+    ctx = jQuery('#contextmenu')
+    if (ctx.attr('init_value') == 'false') {
+        new ListView('_terp_list').onBooleanClicked(true, ctx.attr('rec_id'), true);
+        jQuery('#_terp_list\\/'+ctx.attr('rec_id'))[0].checked = false;
+    }
 }
 
 function set_to_default(field_id, model){
@@ -1362,8 +1384,26 @@
     var $target = jQuery(target || targetDammit(evt));
 
     var kind = $target.attr('kind');
+    sidebar = false;
     if (!(kind && $target.is(':input, :enabled'))) {
-        return;
+        if (!$target.parents('#_terp_list').length) {
+            return;
+        }
+        grid = $target.parents('.grid-row')
+        if (!grid.length || !grid.attr('record')) {
+            return;
+        }
+        tick_box = grid.find('#_terp_list\\/'+grid.attr('record'))
+        if (!tick_box.length || tick_box.disabled) {
+            return;
+        }
+        sidebar = true;
+        checked = true;
+        if (!tick_box[0].checked) {
+            new ListView('_terp_list').onBooleanClicked(false, grid.attr('record'), true)
+            tick_box[0].checked=true;
+            checked = false;
+        }
     }
     var $menu = jQuery('#contextmenu').show();
 
@@ -1390,8 +1430,12 @@
     $menu.offset({top: 0, left: 0});
     $menu.offset({top: click_position.y - 5, left: click_position.x - 5});
     $menu.hide();
-    makeContextMenu(src, kind, $src.attr('relation'), $src.val(), $src.attr('hide_default_menu'));
 
+    if (sidebar) {
+        makeListContextMenu(grid.attr('record'), checked);
+    } else {
+        makeContextMenu(src, kind, $src.attr('relation'), $src.val(), $src.attr('hide_default_menu'));
+    }
     stopEventDammit(evt);
 }
 

=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2018-03-02 16:02:21 +0000
+++ addons/openerp/static/javascript/listgrid.js	2018-05-17 08:40:34 +0000
@@ -67,7 +67,11 @@
         if (previous_field) {
             sel = previous_field.val() || "";
             if (!sel) {return []};
-            return sel.split(',').map(function(b) {return parseInt(b, 10)});
+            var listids = sel.split(',').map(function(b) {return parseInt(b, 10)});
+            if ($('#contextmenu').is(':visible')) {
+                return listids.reverse();
+            }
+            return listids
         }
         return [];
     },
@@ -198,23 +202,27 @@
     },
 
     onBooleanClicked: function() {
-        if (arguments.length == 2) {
+        var nosidebar = false;
+        if (arguments.length >= 2) {
             var clicked = !arguments[0];
             var id = arguments[1];
+            nosidebar = arguments[2];
             if (clicked) {
                 this.add_previously_selected(id);
             } else {
                 this.remove_previously_selected(id);
             }
         }
-        var $sidebar = jQuery('.toggle-sidebar');
-        if ($sidebar.is('.closed')) {
-            $sidebar.click()
-        }
-        if(!this.getSelectedRecords().length) {
-            $sidebar.click();
-        }
 
+        if (!nosidebar) {
+            var $sidebar = jQuery('.toggle-sidebar');
+            if ($sidebar.is('.closed')) {
+                $sidebar.click()
+            }
+            if(!this.getSelectedRecords().length) {
+                $sidebar.click();
+            }
+        }
            this.selectedRow_sum();
     },