From e9ae0b4906921dad23a9c6c3ce95994d2bfc5a21 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 8 Feb 2012 14:31:45 +0100 Subject: [PATCH 01/11] [IMP] Kanban: renamed button 'New' to 'Create' in order to match list view bzr revid: fme@openerp.com-20120208133145-jvx9u1i3tdvkw250 --- addons/web_kanban/static/src/xml/web_kanban.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 3490b7a171f..fb506d6ffa7 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -2,7 +2,7 @@
- +
From 301afd4baa4b2cd8ae10f3de3fe525104f993d0a Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 8 Feb 2012 14:50:10 +0100 Subject: [PATCH 02/11] [REM] hide menutip option from user preference bzr revid: al@openerp.com-20120208135010-u6s6tl1loss9a74u --- openerp/addons/base/base_update.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml index aa38561dacd..c5594f76e22 100644 --- a/openerp/addons/base/base_update.xml +++ b/openerp/addons/base/base_update.xml @@ -89,7 +89,7 @@ - + From 9cc531505f7a00083b32a91215dbef3213dc2a02 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 8 Feb 2012 14:56:55 +0100 Subject: [PATCH 03/11] [FIX] formatting of float_time fields lp bug: https://launchpad.net/bugs/928220 fixed bzr revid: xmo@openerp.com-20120208135655-79qnr5tl6admxr1e --- addons/web/static/src/js/formats.js | 7 ++++++- addons/web/static/test/formats.js | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index eb7d6c335ac..d35a28f36b7 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -101,7 +101,12 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) { formatted[0] = openerp.web.insert_thousand_seps(formatted[0]); return formatted.join(l10n.decimal_point); case 'float_time': - return _.str.sprintf("%02d:%02d", + var pattern = '%02d:%02d'; + if (value < 0) { + value = Math.abs(value); + pattern = '-' + pattern; + } + return _.str.sprintf(pattern, Math.floor(value), Math.round((value % 1) * 60)); case 'many2one': diff --git a/addons/web/static/test/formats.js b/addons/web/static/test/formats.js index 640eaaadca7..2e292af41c8 100644 --- a/addons/web/static/test/formats.js +++ b/addons/web/static/test/formats.js @@ -71,6 +71,15 @@ $(document).ready(function () { strictEqual( openerp.web.format_value(0.0085, {type:'float', widget:'float_time'}), '00:01'); + strictEqual( + openerp.web.format_value(-1.0, {type:'float', widget:'float_time'}), + '-01:00'); + strictEqual( + openerp.web.format_value(-0.9853, {type:'float', widget:'float_time'}), + '-00:59'); + strictEqual( + openerp.web.format_value(-0.0085, {type:'float', widget:'float_time'}), + '-00:01'); }); test("format_float", function () { var fl = 12.1234; From 5af49817f451584930b762ad6ccf7b572037fb07 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 8 Feb 2012 14:59:45 +0100 Subject: [PATCH 04/11] [FIX] allow text inside - - From 232a51901ca06cb5c8362820b32f8f0187f4427d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 28 Aug 2012 14:39:06 +0200 Subject: [PATCH 11/11] [FIX] When drag&dropping a card in kanban view, the record is opened under Firefox. bzr revid: fme@openerp.com-20120828123906-mc9pbcwb6tiv8da1 --- addons/web_kanban/static/src/js/kanban.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 25d83b5c905..7a3c782f44b 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -286,6 +286,9 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ start: function(event, ui) { self.currently_dragging.index = ui.item.index(); self.currently_dragging.group = ui.item.parents('.oe_kanban_column:first').data('widget'); + ui.item.find('*').on('click.prevent', function(ev) { + return false; + }); }, stop: function(event, ui) { var record = ui.item.data('widget'); @@ -296,6 +299,11 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ if (!(old_group.title === new_group.title && old_group.value === new_group.value && old_index == new_index)) { self.on_record_moved(record, old_group, old_index, new_group, new_index); } + setTimeout(function() { + // A bit hacky but could not find a better solution for Firefox (problem not present in chrome) + // http://stackoverflow.com/questions/274843/preventing-javascript-click-event-with-scriptaculous-drag-and-drop + ui.item.find('*').off('click.prevent'); + }, 0); }, scroll: false });