From 53597dc1922184adc950b92796562f22baad35f6 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 31 May 2012 11:41:00 +0200 Subject: [PATCH 1/9] Small inconsistency in m2mtags bzr revid: nicolas.vanhoren@openerp.com-20120531094100-ynh1zz5koclrkxbd --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index ca1d576a8e5..7d52ccf2599 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3168,7 +3168,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(_. }); self.tags = self.$text.textext()[0].tags(); $("textarea", this.$element).focusout(function() { - $("textarea", this.$element).val(""); + self.$text.trigger("setInputData", ""); }).keydown(function(e) { if (event.keyCode === 9 && self._drop_shown) { self.$text.textext()[0].autocomplete().selectFromDropdown(); From d5daf869daf13a900a85499e3577703b9eaac811 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 31 May 2012 11:46:47 +0200 Subject: [PATCH 2/9] Changed buttons in quick create bzr revid: nicolas.vanhoren@openerp.com-20120531094647-by15fj5di9a2m9kv --- addons/web_kanban/static/src/css/kanban.css | 3 --- addons/web_kanban/static/src/xml/web_kanban.xml | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index dd376ef44e5..aba80c203bc 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -107,9 +107,6 @@ box-sizing: border-box; width: 100%; } -.openerp .oe_kanban_view .oe_kanban_quick_create button { - float: right; -} .openerp .oe_kanban_view .oe_kanban_vignette { padding: 8px; min-height: 100px; diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index cabe9cb52fb..736c64f90b8 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -66,8 +66,10 @@
- - +
+ + or Cancel +
From c257e6f1bf45d750fce9c25700f4673bb8d75090 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 31 May 2012 12:01:09 +0200 Subject: [PATCH 3/9] Corrected bug with quick create in group mode bzr revid: nicolas.vanhoren@openerp.com-20120531100109-qekw54w6s7xoebzn --- addons/web_kanban/static/src/css/kanban.css | 3 +++ addons/web_kanban/static/src/js/kanban.js | 6 +++--- addons/web_kanban/static/src/xml/web_kanban.xml | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index aba80c203bc..c341475c169 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -107,6 +107,9 @@ box-sizing: border-box; width: 100%; } +.openerp .oe_kanban_view .oe_kanban_quick_create .oe_kanban_quick_create_buttons { + margin-bottom: 10px; +} .openerp .oe_kanban_view .oe_kanban_vignette { padding: 8px; min-height: 100px; diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 4a4e385cd1b..9a8e23bc515 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -417,7 +417,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({ this.quick.destroy(); delete this.quick; }); - self.quick.appendTo(self.$element.find('.oe_kanban_header')); + self.quick.appendTo($(".oe_kanban_group_list_header", self.$records)); self.quick.focus(); }); this.$records.find('.oe_kanban_show_more').click(this.do_show_more); @@ -466,7 +466,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({ rec.insertBefore(self.$records.find('.oe_kanban_show_more')); self.records.push(rec); } else { - rec.prependTo(self.$records); + rec.insertAfter($(".oe_kanban_group_list_header", self.$records)); self.records.unshift(rec); } }); @@ -502,7 +502,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({ this.dataset.read_ids([id], this.view.fields_keys) .then(function (records) { self.view.dataset.ids.push(id); - self.do_add_records(records, 'prepend'); + self.do_add_records(records, true); }); } }); diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 736c64f90b8..18922fefa71 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -48,6 +48,7 @@ +
@@ -66,7 +67,7 @@
-
+
or Cancel
From 8afd115acab38f2c7698eef1e498ae6fa30d6886 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 31 May 2012 12:02:17 +0200 Subject: [PATCH 4/9] Changed text bzr revid: nicolas.vanhoren@openerp.com-20120531100217-87yxss40g0ebcsr0 --- 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 18922fefa71..b50c2910e3c 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -65,7 +65,7 @@
- +
From 3eafe0a6be1ab577e149a6c02d9151947e13a32e Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 31 May 2012 12:05:03 +0200 Subject: [PATCH 5/9] Added esc button handling bzr revid: nicolas.vanhoren@openerp.com-20120531100503-bvn4jz3ztoscww55 --- addons/web_kanban/static/src/js/kanban.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 9a8e23bc515..360a9dd169a 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -774,6 +774,11 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ $(".oe-kanban-quick_create_close", this.$element).click(function () { self.trigger('close'); }); + self.$input.keyup(function(e) { + if (e.keyCode == 27 && self._buttons) { + self.trigger('close'); + } + }); }, focus: function() { this.$element.find('input').focus(); From 72e17e620e0eeecf89a9da7c2c05c2c75292f3f6 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 4 Jun 2012 11:31:03 +0200 Subject: [PATCH 6/9] Added customization in kanban view to better fit o2m bzr revid: nicolas.vanhoren@openerp.com-20120604093103-lydwjek920m3zxoe --- addons/web/static/src/js/view_form.js | 3 +++ addons/web_kanban/static/src/js/kanban.js | 23 ++++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 809c707feb0..0889f7d8dee 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2744,9 +2744,12 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ } view.options.not_interactible_on_create = true; } else if (view.view_type === "kanban") { + view.options.confirm_on_delete = false; if (self.get("effective_readonly")) { view.options.action_buttons = false; view.options.quick_creatable = false; + view.options.creatable = false; + view.options.read_only_mode = true; } } views.push(view); diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 13fd9547376..96487fa8b7e 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -14,7 +14,13 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ number_of_color_schemes: 10, init: function (parent, dataset, view_id, options) { this._super(parent, dataset, view_id, options); - _.defaults(this.options, {"quick_creatable": true, "creatable": true, "create_text": undefined}); + _.defaults(this.options, { + "quick_creatable": true, + "creatable": true, + "create_text": undefined, + "read_only_mode": false, + "confirm_on_delete": true, + }); this.fields_view = {}; this.fields_keys = []; this.group_by = null; @@ -550,7 +556,8 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({ render: function() { this.qweb_context = { record: this.record, - widget: this + widget: this, + read_only_mode: this.view.options.read_only_mode, }; for (var p in this) { if (_.str.startsWith(p, 'kanban_')) { @@ -653,12 +660,18 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({ }, do_action_delete: function($action) { var self = this; - if (confirm(_t("Are you sure you want to delete this record ?"))) { - return $.when(this.view.dataset.unlink([this.id])).then(function() { + function do_it() { + return $.when(self.view.dataset.unlink([self.id])).then(function() { self.group.remove_record(self.id); self.destroy(); }); - } + }; + if (this.view.options.confirm_on_delete) { + if (confirm(_t("Are you sure you want to delete this record ?"))) { + return do_it(); + } + } else + return do_it(); }, do_action_edit: function($action) { var self = this; From e304cd68ebcf1af7613633efcb41417b8de7bc98 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 4 Jun 2012 12:37:35 +0200 Subject: [PATCH 7/9] Customization of kanban view for m2m bzr revid: nicolas.vanhoren@openerp.com-20120604103735-qrxlou2p8kdm2vq8 --- addons/web/static/src/js/view_form.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0889f7d8dee..db055879051 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3410,6 +3410,8 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend( 'create_text': _t("Add"), 'creatable': self.get("effective_readonly") ? false : true, 'quick_creatable': self.get("effective_readonly") ? false : true, + 'read_only_mode': self.get("effective_readonly") ? true : false, + 'confirm_on_delete': false, }); var embedded = (this.field.views || {}).kanban; if (embedded) { From 344a602f31bbae22ef228fccdf27db1e8a66136c Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 4 Jun 2012 14:36:09 +0200 Subject: [PATCH 8/9] fixed some problems for m2m_kanban bzr revid: nicolas.vanhoren@openerp.com-20120604123609-yo00px9dvr6mj2cc --- addons/web/static/src/js/view_form.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index db055879051..66586472462 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3558,6 +3558,7 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({ var self = this; self.$text.val(""); self.trigger('added', id); + this.m2m.dataset_changed(); }, }); } @@ -3612,7 +3613,7 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({ width: '90%', min_width: '800px', close: function() { - self.check_exit(); + self.check_exit(true); }, title: this.options.title || "", }, this.$element).open(); @@ -3670,9 +3671,10 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({ }, on_select_elements: function(element_ids) { }, - check_exit: function() { + check_exit: function(no_destroy) { if (this.created_elements.length > 0) { this.on_select_elements(this.created_elements); + this.created_elements = []; } this.destroy(); }, From 6ce3b6aeefd9c1fb1ead1e775942b8af29433a2d Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 4 Jun 2012 14:45:43 +0200 Subject: [PATCH 9/9] Removed ability to click to link in m2m_tags bzr revid: nicolas.vanhoren@openerp.com-20120604124543-tc39k033k5ny1k42 --- addons/web/static/src/css/base.css | 3 +-- addons/web/static/src/css/base.sass | 1 - addons/web/static/src/js/view_form.js | 26 +------------------------- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e2879011a72..1f568df46e8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "UTF-8"; +@charset "utf-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -1787,7 +1787,6 @@ color: black; padding: 0px 3px 0px 3px; margin: 0 2px 2px 0; - cursor: pointer; height: 16px; font: 11px "lucida grande", tahoma, verdana, arial, sans-serif; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index eda410aa6ca..72cef4f52f7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1429,7 +1429,6 @@ $colour4: #8a89ba color: black padding: 0px 3px 0px 3px margin: 0 2px 2px 0 - cursor: pointer height: 16px font: 11px "lucida grande", tahoma, verdana, arial, sans-serif .text-core .text-wrap .text-dropdown .text-list .text-suggestion em diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 66586472462..ec4861956b5 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3099,7 +3099,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(_. if (this.get("effective_readonly")) return; var self = this; - self. $text = $("textarea", this.$element); + self.$text = $("textarea", this.$element); self.$text.textext({ plugins : 'tags arrow autocomplete', autocomplete: { @@ -3151,19 +3151,6 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(_. return _.extend(el, {index:i}); })}); }); - }).bind('tagClick', function(e, tag, value, callback) { - var pop = new instance.web.form.FormOpenPopup(self.view); - pop.show_element( - self.field.relation, - value.id, - self.build_context(), - { - title: _t("Open: ") + (self.string || self.name) - } - ); - pop.on_write_completed.add_last(function() { - self.render_value(); - }); }).bind('hideDropdown', function() { self._drop_shown = false; }).bind('showDropdown', function() { @@ -3207,17 +3194,6 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(_. self.tags.addTags(_.map(data, function(el) {return {name: el[1], id:el[0]};})); } else { self.$element.html(QWeb.render("FieldMany2ManyTags.box", {elements: data})); - $(".oe_form_field_many2manytags_box", self.$element).click(function() { - var index = Number($(this).data("index")); - self.do_action({ - type: 'ir.actions.act_window', - res_model: self.field.relation, - res_id: self.get("value")[index], - context: self.build_context(), - views: [[false, 'form']], - target: 'current' - }); - }); } }; if (! self.get('values') || self.get('values').length > 0) {