From 8d509498b6ee28c96866b76803b07bce00114329 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Mon, 16 Dec 2013 18:26:02 +0530 Subject: [PATCH 01/37] [IMP] add stage mode widget bzr revid: rgaopenerp-20131216125602-r10t3se7hgvoy73w --- addons/web/static/src/js/view_form.js | 40 ++++++++++++++++++++++++++- addons/web/static/src/xml/base.xml | 25 +++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index f20e9053867..d772cbb55cd 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2330,7 +2330,44 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we }); } }); - +instance.web.form.StageMode = instance.web.form.FieldChar.extend({ + init: function (field_manager, node) { + this._super(field_manager, node); + this.options = py.eval(node.attrs.options) + this.stage_dataset = new instance.web.DataSetStatic(this, this.options.stage_model, this.build_context()); + this.stage_field = this.options.stage_field; + }, + + get_stage_value: function(){ + var def = $.Deferred(); + var stage_id = this.field_manager.fields[this.stage_field].get_value() + this.stage_dataset.call('search_read', [[[this.stage_field,'=', stage_id],['type','=',this.name]]]).then(function (res){ + def.resolve(res); + }) + return def + }, + + render_value: function() { + var self = this; + self.get_stage_value().then(function (res){ + var content = QWeb.render("StageMode."+self.name, { + 'widget': self, + 'res': res, + }); + self.$el.html(content); + self.$el.find("li").click(self.execute_action.bind(self)); + }) + }, + execute_action: function(e){ + e.preventDefault(); + var self = this; + $this = $(e.target) + var value = $this.data('value') || $this.parent().data('value'); + return this.view.dataset.call_button(self.options.action, [this.view.datarecord.id, value, this.view.dataset.get_context()]).done(function(r) { + self.view.reload(); + }); + } +}); instance.web.form.FieldID = instance.web.form.FieldChar.extend({ process_modifiers: function () { this._super(); @@ -5853,6 +5890,7 @@ instance.web.form.widgets = new instance.web.Registry({ 'monetary': 'instance.web.form.FieldMonetary', 'many2many_checkboxes': 'instance.web.form.FieldMany2ManyCheckBoxes', 'x2many_counter': 'instance.web.form.X2ManyCounter', + 'stage_mode':'instance.web.form.StageMode' }); /** diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index ae7a4f279b0..8d1f9cb01f4 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1031,6 +1031,31 @@ + + + +
+ + + + + + +
+ + + + + + + + From b5feff915301efaef7468d736af78f963f2d1f24 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Tue, 17 Dec 2013 17:03:10 +0530 Subject: [PATCH 02/37] [IMP] template set priority bzr revid: rgaopenerp-20131217113310-nkjo30xtdkebkj6q --- addons/web/static/src/xml/base.xml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 8d1f9cb01f4..c6a78ff7f0f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1050,11 +1050,18 @@ - - - - + From 752fa2e2a5b144cb9ce2e7217827c2432f385255 Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Thu, 19 Dec 2013 14:08:51 +0530 Subject: [PATCH 03/37] [IMP]improved css as well as improved stagemode widget bzr revid: mba@tinyerp.com-20131219083851-c2hp4dddtpfxm0l6 --- addons/web/static/src/css/base.css | 38 +++++++++++++++++++++-- addons/web/static/src/css/base.sass | 25 +++++++++++++++ addons/web/static/src/js/view_form.js | 5 +-- addons/web/static/src/js/view_list.js | 3 +- addons/web/static/src/xml/base.xml | 6 ++-- addons/web_kanban/static/src/js/kanban.js | 13 +++++--- 6 files changed, 76 insertions(+), 14 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 010585ee4a0..e59be2e551e 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"); @@ -2290,7 +2290,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkGreen; + color: darkgreen; vertical-align: top; position: relative; top: -4px; @@ -3434,7 +3434,6 @@ div.ui-widget-overlay { overflow: hidden !important; } } - .nav li > a { padding: 3px 4px 2px 18px; color: #4c4c4c; @@ -3569,6 +3568,39 @@ h5 { color: #eeeeee; } +.dropdown-menu.with-arrow { + background: white; + background: white !important; +} + +.dropdown-menu.with-arrow:before { + position: absolute; + top: -12px; + left: 9px; + display: inline-block; + border-right: 12px solid transparent; + border-bottom: 12px solid #cccccc; + border-left: 12px solid transparent; + border-bottom-color: rgba(0, 0, 0, 0.2); + content: ""; +} + +.dropdown-menu.with-arrow:after { + position: absolute; + top: -11px; + left: 10px; + display: inline-block; + border-right: 11px solid transparent; + border-bottom: 11px solid white; + border-left: 11px solid transparent; + content: ""; +} + +.dropdown-menu.with-arrow li a { + color: black; + font-weight: bold; +} + .ui-icon { width: 18px; height: 18px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e9a51370192..3f915de78d9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2843,6 +2843,31 @@ h5 li a,a:hover,a:focus color: #eeeeee +.dropdown-menu.with-arrow + background: #FFF + background: #FFF !important +.dropdown-menu.with-arrow:before + position: absolute + top: -12px + left: 9px + display: inline-block + border-right: 12px solid transparent + border-bottom: 12px solid #ccc + border-left: 12px solid transparent + border-bottom-color: rgba(0, 0, 0, 0.2) + content: '' +.dropdown-menu.with-arrow:after + position: absolute + top: -11px + left: 10px + display: inline-block + border-right: 11px solid transparent + border-bottom: 11px solid #ffffff + border-left: 11px solid transparent + content: '' +.dropdown-menu.with-arrow li a + color: #000 + font-weight: bold // End hack }}} // Hack for ui icon {{{ diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index d772cbb55cd..ceed2037813 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2334,14 +2334,15 @@ instance.web.form.StageMode = instance.web.form.FieldChar.extend({ init: function (field_manager, node) { this._super(field_manager, node); this.options = py.eval(node.attrs.options) - this.stage_dataset = new instance.web.DataSetStatic(this, this.options.stage_model, this.build_context()); + this.stage_dataset = new instance.web.DataSetStatic(this, 'ir.ui.legend', this.build_context()); this.stage_field = this.options.stage_field; }, get_stage_value: function(){ var def = $.Deferred(); var stage_id = this.field_manager.fields[this.stage_field].get_value() - this.stage_dataset.call('search_read', [[[this.stage_field,'=', stage_id],['type','=',this.name]]]).then(function (res){ + var model = this.field_manager.fields[this.stage_field].field.relation + this.stage_dataset.call('search_read', [[['res_id','=', stage_id],['type','=',this.name],['res_model','=',model]]]).then(function (res){ def.resolve(res); }) return def diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 17c62917a18..d11393825cf 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -1104,10 +1104,11 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web. record.set(column.id, false); } } - return column.format(record.toForm().data, { + var value = column.format(record.toForm().data, { model: this.dataset.model, id: record.get('id') }); + return _.unescape(value) }, render: function () { this.$current.empty().append( diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c6a78ff7f0f..14122c5acf8 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1040,17 +1040,17 @@ -
    +
      -
      • +
    -
      +
        • diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index b14f60e15f8..4106ed21ffa 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -34,6 +34,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ }; this.groups = []; this.aggregates = {}; + this.legend = {}; this.group_operators = ['avg', 'max', 'min', 'sum', 'count']; this.qweb = new QWeb2.Engine(); this.qweb.debug = instance.session.debug; @@ -624,7 +625,10 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ } this.$el.data('widget', this); this.$records.data('widget', this); - this.$has_been_started.resolve(); + var def_tooltip = this.fetch_tooltip(); + $.when(def_tooltip).done(function (){ + self.$has_been_started.resolve(); + }); var add_btn = this.$el.find('.oe_kanban_add'); add_btn.tipsy({delayIn: 500, delayOut: 1000}); this.$records.find(".oe_kanban_column_cards").click(function (ev) { @@ -635,8 +639,6 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ } }); this.is_started = true; - var def_tooltip = this.fetch_tooltip(); - return $.when(def_tooltip); }, fetch_tooltip: function() { if (! this.group) @@ -665,8 +667,9 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ if (this.value) { return (new instance.web.Model(field.relation)).query([options.tooltip_on_group_by]) .filter([["id", "=", this.value]]).first().then(function(res) { - self.tooltip = res[options.tooltip_on_group_by]; - self.$(".oe_kanban_group_title_text").attr("title", self.tooltip || self.title || "").tipsy({html: true}); + self.legend = res[options.tooltip_on_group_by]; + var title = self.legend.tooltip || self.legend || self.title || "" + self.$(".oe_kanban_group_title_text").attr("title", title).tipsy({html: true,className: 'oe_tooltip_kanban_message'}); }); } }, From fdcb64ef8c4bf9775bc38e133ccd923342fd7fa7 Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Fri, 20 Dec 2013 14:18:46 +0530 Subject: [PATCH 04/37] [IMP]improve the legend widget bzr revid: mba@tinyerp.com-20131220084846-875n332j1m1igip7 --- addons/web/static/src/css/base.css | 5 +++-- addons/web/static/src/css/base.sass | 3 ++- addons/web/static/src/js/view_form.js | 32 +++++++++------------------ addons/web/static/src/xml/base.xml | 24 ++++++++++---------- 4 files changed, 27 insertions(+), 37 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e59be2e551e..c40bb16cdf1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3598,9 +3598,10 @@ h5 { .dropdown-menu.with-arrow li a { color: black; - font-weight: bold; } - +.dropdown-menu.with-arrow li a, .dropdown-menu.with-arrow li a:hover, .dropdown-menu.with-arrow li a:focus { + text-decoration: none; +} .ui-icon { width: 18px; height: 18px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3f915de78d9..c36cc2b8eb2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2867,7 +2867,8 @@ h5 content: '' .dropdown-menu.with-arrow li a color: #000 - font-weight: bold +.dropdown-menu.with-arrow li a, .dropdown-menu.with-arrow li a:hover, .dropdown-menu.with-arrow li a:focus + text-decoration: none; // End hack }}} // Hack for ui icon {{{ diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index ceed2037813..0d3a38b5c17 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2330,34 +2330,22 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we }); } }); -instance.web.form.StageMode = instance.web.form.FieldChar.extend({ +instance.web.form.Legend = instance.web.form.FieldChar.extend({ init: function (field_manager, node) { this._super(field_manager, node); this.options = py.eval(node.attrs.options) - this.stage_dataset = new instance.web.DataSetStatic(this, 'ir.ui.legend', this.build_context()); - this.stage_field = this.options.stage_field; - }, - - get_stage_value: function(){ - var def = $.Deferred(); - var stage_id = this.field_manager.fields[this.stage_field].get_value() - var model = this.field_manager.fields[this.stage_field].field.relation - this.stage_dataset.call('search_read', [[['res_id','=', stage_id],['type','=',this.name],['res_model','=',model]]]).then(function (res){ - def.resolve(res); - }) - return def + this.legend_field = this.options.legend_field; }, render_value: function() { var self = this; - self.get_stage_value().then(function (res){ - var content = QWeb.render("StageMode."+self.name, { - 'widget': self, - 'res': res, - }); - self.$el.html(content); - self.$el.find("li").click(self.execute_action.bind(self)); - }) + var legend_value = this.field_manager.fields[this.legend_field].get_value() + var content = QWeb.render("Legend."+ self.name, { + 'widget': self, + 'legend_value': legend_value, + }); + self.$el.html(content); + self.$el.find("li").click(self.execute_action.bind(self)); }, execute_action: function(e){ e.preventDefault(); @@ -5891,7 +5879,7 @@ instance.web.form.widgets = new instance.web.Registry({ 'monetary': 'instance.web.form.FieldMonetary', 'many2many_checkboxes': 'instance.web.form.FieldMany2ManyCheckBoxes', 'x2many_counter': 'instance.web.form.X2ManyCounter', - 'stage_mode':'instance.web.form.StageMode' + 'legend':'instance.web.form.Legend' }); /** diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 14122c5acf8..bf185cd6df0 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1033,32 +1033,32 @@         - +
        - - + +
          - - + +
        - -
          - - + +
            + +
            • - - -
            • + + +
          From 53a1a4f1fbbcc3d11f1e973333a8073b526b748e Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Fri, 20 Dec 2013 14:58:40 +0530 Subject: [PATCH 05/37] [IMP]improved css bzr revid: mba@tinyerp.com-20131220092840-933qq22q1v9287mn --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c40bb16cdf1..c4f0f91adcd 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3576,7 +3576,7 @@ h5 { .dropdown-menu.with-arrow:before { position: absolute; top: -12px; - left: 9px; + left: 0px; display: inline-block; border-right: 12px solid transparent; border-bottom: 12px solid #cccccc; @@ -3588,7 +3588,7 @@ h5 { .dropdown-menu.with-arrow:after { position: absolute; top: -11px; - left: 10px; + left: 1px; display: inline-block; border-right: 11px solid transparent; border-bottom: 11px solid white; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c36cc2b8eb2..078fb28e137 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2849,7 +2849,7 @@ h5 .dropdown-menu.with-arrow:before position: absolute top: -12px - left: 9px + left: 0px display: inline-block border-right: 12px solid transparent border-bottom: 12px solid #ccc @@ -2859,7 +2859,7 @@ h5 .dropdown-menu.with-arrow:after position: absolute top: -11px - left: 10px + left: 1px display: inline-block border-right: 11px solid transparent border-bottom: 11px solid #ffffff From ab6f79e75914636b7921afeeb8fa48e31aa92383 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Fri, 20 Dec 2013 15:49:40 +0530 Subject: [PATCH 06/37] [IMP] legend widget bzr revid: rgaopenerp-20131220101940-90ialtu8fqcdborg --- addons/web/static/src/js/view_form.js | 17 ++++++------ addons/web/static/src/xml/base.xml | 6 ++--- addons/web_kanban/static/src/js/kanban.js | 32 +++++++++++++++++++++++ 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0d3a38b5c17..d31f8ff2145 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2344,17 +2344,18 @@ instance.web.form.Legend = instance.web.form.FieldChar.extend({ 'widget': self, 'legend_value': legend_value, }); - self.$el.html(content); - self.$el.find("li").click(self.execute_action.bind(self)); + this.$el.html(content); + this.$el.find('li').click(self.execute_action.bind(self)); }, execute_action: function(e){ - e.preventDefault(); var self = this; - $this = $(e.target) - var value = $this.data('value') || $this.parent().data('value'); - return this.view.dataset.call_button(self.options.action, [this.view.datarecord.id, value, this.view.dataset.get_context()]).done(function(r) { - self.view.reload(); - }); + var li = $(e.target).closest( "li" ); + if (li.length){ + var value = li.data('value'); + return this.view.dataset.call_button(self.options.action, [this.view.datarecord.id, value, this.view.dataset.get_context()]).done(function(r) { + self.view.reload(); + }); + } } }); instance.web.form.FieldID = instance.web.form.FieldChar.extend({ diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index bf185cd6df0..12b247534a8 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1043,7 +1043,7 @@
            -
            • +
          @@ -1053,12 +1053,12 @@
            -
            • +
            • -
            • +
          diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 4106ed21ffa..ec5c8cce204 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1230,7 +1230,39 @@ instance.web_kanban.AbstractField = instance.web.Widget.extend(instance.web_kanb }, }); +instance.web_kanban.Legend = instance.web_kanban.AbstractField.extend({ + init: function(parent, field, $node) { + this._super.apply(this, arguments); + this.parent = parent; + this.name = $node.attr('name') + }, + renderElement: function() { + var self = this; + var legend_field = this.options.legend_field; + var legend_field_value = this.parent.record[legend_field].raw_value + var content = QWeb.render("Legend." + self.name, { + 'widget': self, + 'legend_value': legend_field_value, + }); + this.$el.html(content); + this.$el.click(self.execute_action.bind(self)); + }, + execute_action: function(e){ + e.preventDefault(); + var li = $(e.target).closest( "li" ); + if (li.length){ + var parent = this.parent + var value = li.data('value'); + return parent.view.dataset.call_button(this.options.action, [parent.id, value, parent.view.dataset.get_context()]).done(function(r) { + parent.do_reload(); + }); + } + } +}); + + instance.web_kanban.fields_registry = new instance.web.Registry({}); +instance.web_kanban.fields_registry.add('legend','instance.web_kanban.Legend'); }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: From 6ad2ea0202360fefa68fa36740379cec0926a266 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Fri, 20 Dec 2013 17:40:19 +0530 Subject: [PATCH 07/37] [IMP] legend widget bzr revid: rgaopenerp-20131220121019-h1o0lllprbo02uqa --- addons/web/static/src/js/view_form.js | 53 +++++++++++++++-------- addons/web/static/src/xml/base.xml | 8 ++-- addons/web_kanban/static/src/js/kanban.js | 23 +++------- 3 files changed, 47 insertions(+), 37 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index d31f8ff2145..a967a9c9d66 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2330,34 +2330,53 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we }); } }); -instance.web.form.Legend = instance.web.form.FieldChar.extend({ - init: function (field_manager, node) { - this._super(field_manager, node); - this.options = py.eval(node.attrs.options) - this.legend_field = this.options.legend_field; + +instance.web.Legend = instance.web.Widget.extend({ + init: function (parent, dataset, options) { + this._super(parent); + this.parent = parent; + this.dataset = dataset; + this.options = options; }, - render_value: function() { + render_value: function(record_id, data) { var self = this; - var legend_value = this.field_manager.fields[this.legend_field].get_value() - var content = QWeb.render("Legend."+ self.name, { - 'widget': self, - 'legend_value': legend_value, - }); - this.$el.html(content); - this.$el.find('li').click(self.execute_action.bind(self)); + self.record_id = record_id; + var content = QWeb.render("Legend."+ self.parent.name, data); + this.parent.$el.html(content); + if (!this.parent.get("effective_readonly")){ + this.parent.$el.find('.oe_legend').click(self.do_action.bind(self)); + } }, - execute_action: function(e){ + do_action: function(e){ var self = this; var li = $(e.target).closest( "li" ); if (li.length){ var value = li.data('value'); - return this.view.dataset.call_button(self.options.action, [this.view.datarecord.id, value, this.view.dataset.get_context()]).done(function(r) { - self.view.reload(); - }); + return self.dataset.call_button(self.options.action, [self.record_id, value, self.dataset.get_context()]).done(self.parent.reload_record.bind(self.parent)); } } }); + +instance.web.form.Legend = instance.web.form.FieldChar.extend({ + init: function (field_manager, node) { + this._super(field_manager, node); + this.legend = new instance.web.Legend(this, this.view.dataset, py.eval(node.attrs.options)); + }, + + reload_record: function(){ + this.view.reload(); + }, + render_value: function() { + var self = this; + var legend_field = this.options.legend_field; + var legend_value = this.field_manager.fields[legend_field].get_value(); + self.legend.render_value(this.view.datarecord.id, { + 'widget': self, + 'legend_value': legend_value, + }); + }, +}); instance.web.form.FieldID = instance.web.form.FieldChar.extend({ process_modifiers: function () { this._super(); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 12b247534a8..5dc8d210a32 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1036,14 +1036,14 @@
          - +
            -
            • +
          @@ -1053,12 +1053,12 @@
            -
            • +
            • -
            • +
          diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index ec5c8cce204..888397c90ac 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1233,31 +1233,22 @@ instance.web_kanban.AbstractField = instance.web.Widget.extend(instance.web_kanb instance.web_kanban.Legend = instance.web_kanban.AbstractField.extend({ init: function(parent, field, $node) { this._super.apply(this, arguments); - this.parent = parent; this.name = $node.attr('name') + this.parent = parent; + this.legend = new instance.web.Legend(this, parent.view.dataset, this.options); + }, + reload_record: function(){ + this.parent.do_reload(); }, renderElement: function() { var self = this; var legend_field = this.options.legend_field; - var legend_field_value = this.parent.record[legend_field].raw_value - var content = QWeb.render("Legend." + self.name, { + var legend_field_value = this.parent.record[legend_field].raw_value + self.legend.render_value(this.parent.id, { 'widget': self, 'legend_value': legend_field_value, }); - this.$el.html(content); - this.$el.click(self.execute_action.bind(self)); }, - execute_action: function(e){ - e.preventDefault(); - var li = $(e.target).closest( "li" ); - if (li.length){ - var parent = this.parent - var value = li.data('value'); - return parent.view.dataset.call_button(this.options.action, [parent.id, value, parent.view.dataset.get_context()]).done(function(r) { - parent.do_reload(); - }); - } - } }); From 805fef4f478082c3f4c733648c7c534c57dbadd5 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Fri, 20 Dec 2013 19:38:24 +0530 Subject: [PATCH 08/37] [IMP] legend widget bzr revid: rgaopenerp-20131220140824-2zr27ool75k60u1w --- addons/web/static/src/js/view_form.js | 6 +++++- addons/web/static/src/xml/base.xml | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index a967a9c9d66..ede4d7a0c5d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2343,7 +2343,10 @@ instance.web.Legend = instance.web.Widget.extend({ var self = this; self.record_id = record_id; var content = QWeb.render("Legend."+ self.parent.name, data); - this.parent.$el.html(content); + if (data.view_mode === 'form') + this.parent.$el.html(content); + else + this.parent.$el = $(content); if (!this.parent.get("effective_readonly")){ this.parent.$el.find('.oe_legend').click(self.do_action.bind(self)); } @@ -2374,6 +2377,7 @@ instance.web.form.Legend = instance.web.form.FieldChar.extend({ self.legend.render_value(this.view.datarecord.id, { 'widget': self, 'legend_value': legend_value, + 'view_mode':'form' }); }, }); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5dc8d210a32..cd7005c7bfd 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1034,7 +1034,7 @@ -
          + @@ -1047,7 +1047,7 @@
        - +
          From 54346578c86a10d14497f18e8b3aafc930eb6a2b Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Thu, 26 Dec 2013 15:07:22 +0530 Subject: [PATCH 09/37] [IMP]improved title for tooltip bzr revid: mba@tinyerp.com-20131226093722-mbv3s7jxjz5s1sjg --- addons/web/static/src/xml/base.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index cd7005c7bfd..f3eba6dde09 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1036,7 +1036,7 @@ - + @@ -1053,12 +1053,12 @@
            -
            • +
            • -
            • +
          From d7e09b669c9118021020ff0e3da6ba041ec9c5c8 Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Tue, 7 Jan 2014 18:28:32 +0530 Subject: [PATCH 10/37] [IMP] bzr revid: mba@tinyerp.com-20140107125832-fzt8cceyj3et7hgy --- addons/web/static/src/js/view_form.js | 41 +++++++++++++++++---- addons/web/static/src/xml/base.xml | 43 +++++++++++------------ addons/web_kanban/static/src/js/kanban.js | 7 ++-- 3 files changed, 57 insertions(+), 34 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index ede4d7a0c5d..901a4bdcb72 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2338,11 +2338,42 @@ instance.web.Legend = instance.web.Widget.extend({ this.dataset = dataset; this.options = options; }, - + prepare_data: function() { + var self =this; + var def = $.Deferred(); + if (this.parent.name == 'kanban_state'){ + var datas = [{ 'name': 'normal', 'legend_name': ' Normal', 'legend': '' }, + { 'name': 'blocked', 'legend_name': ' Blocked', 'legend': '' }, + { 'name': 'done', 'legend_name': ' Done', 'legend': '' }] + return def.resolve(datas); + } + if (this.parent.name == 'priority'){ + var data = []; + var selection = this.parent.field.selection || []; + for (var index in selection) { + value = { + 'name': selection[index][0], + 'legend_name': selection[index][1] + } + if (selection[index][0] == '0'){ + value['legend']= ''; + value['legend_name'] = 'Set the Priority'; + }else{ + value['legend']= ''; + } + data.push(value) + } + return def.resolve(data); + } + }, render_value: function(record_id, data) { var self = this; + var content; self.record_id = record_id; - var content = QWeb.render("Legend."+ self.parent.name, data); + this.prepare_data().then(function (res){ + data['res'] = res; + content = QWeb.render("Legend."+ self.parent.name, data); + }); if (data.view_mode === 'form') this.parent.$el.html(content); else @@ -2366,19 +2397,15 @@ instance.web.form.Legend = instance.web.form.FieldChar.extend({ this._super(field_manager, node); this.legend = new instance.web.Legend(this, this.view.dataset, py.eval(node.attrs.options)); }, - reload_record: function(){ this.view.reload(); }, render_value: function() { var self = this; - var legend_field = this.options.legend_field; - var legend_value = this.field_manager.fields[legend_field].get_value(); self.legend.render_value(this.view.datarecord.id, { 'widget': self, - 'legend_value': legend_value, 'view_mode':'form' - }); + }); }, }); instance.web.form.FieldID = instance.web.form.FieldChar.extend({ diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f3eba6dde09..6fca2d3260e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1032,35 +1032,34 @@ - - + - - - + + + - -
            - - -
            • -             -
          +
            + + +
            • +             +             +
          - -
            - - -
            • + +
              + + +
              • +               - - - -
              • + + +
              • +               -
            diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 888397c90ac..8c9b3fab930 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1242,12 +1242,9 @@ instance.web_kanban.Legend = instance.web_kanban.AbstractField.extend({ }, renderElement: function() { var self = this; - var legend_field = this.options.legend_field; - var legend_field_value = this.parent.record[legend_field].raw_value - self.legend.render_value(this.parent.id, { + self.legend.render_value(self.parent.id, { 'widget': self, - 'legend_value': legend_field_value, - }); + }); }, }); From fa1e5f648765a0699f08497a68259c1eeb713e7d Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Wed, 8 Jan 2014 16:10:51 +0530 Subject: [PATCH 11/37] [IMP]improve widget legend bzr revid: mba@tinyerp.com-20140108104051-5yhbtj4y1w87ygr2 --- addons/web/static/src/js/view_form.js | 54 ++++++++++++++------------- addons/web/static/src/xml/base.xml | 10 ++--- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 901a4bdcb72..b2355a49872 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2338,42 +2338,44 @@ instance.web.Legend = instance.web.Widget.extend({ this.dataset = dataset; this.options = options; }, + prepare_kanban_state_legend: function(){ + return [{ 'name': 'normal', 'legend_name': ' Normal', 'legend': '' }, + { 'name': 'blocked', 'legend_name': ' Blocked', 'legend': '' }, + { 'name': 'done', 'legend_name': ' Done', 'legend': '' }] + }, + prepare_priority_legend: function(){ + var data = []; + var selection = this.parent.field.selection || []; + _.map(selection, function(res){ + value = { + 'name': res[0], + 'legend_name': res[1] + } + if (res[0] == '0'){ + value['legend']= ''; + value['legend_name'] = 'Set the Priority'; + }else{ + value['legend']= ''; + } + data.push(value) + }); + return data; + }, prepare_data: function() { var self =this; - var def = $.Deferred(); if (this.parent.name == 'kanban_state'){ - var datas = [{ 'name': 'normal', 'legend_name': ' Normal', 'legend': '' }, - { 'name': 'blocked', 'legend_name': ' Blocked', 'legend': '' }, - { 'name': 'done', 'legend_name': ' Done', 'legend': '' }] - return def.resolve(datas); + return self.prepare_kanban_state_legend(); } if (this.parent.name == 'priority'){ - var data = []; - var selection = this.parent.field.selection || []; - for (var index in selection) { - value = { - 'name': selection[index][0], - 'legend_name': selection[index][1] - } - if (selection[index][0] == '0'){ - value['legend']= ''; - value['legend_name'] = 'Set the Priority'; - }else{ - value['legend']= ''; - } - data.push(value) - } - return def.resolve(data); + return self.prepare_priority_legend(); } }, render_value: function(record_id, data) { var self = this; - var content; self.record_id = record_id; - this.prepare_data().then(function (res){ - data['res'] = res; - content = QWeb.render("Legend."+ self.parent.name, data); - }); + var legend = this.prepare_data(); + data['legends'] = legend; + var content = QWeb.render("Legend."+ self.parent.name, data); if (data.view_mode === 'form') this.parent.$el.html(content); else diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 6fca2d3260e..4286f7cf689 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1034,13 +1034,13 @@ - +
              - +
              • @@ -1050,14 +1050,14 @@
                - +
                • - + -
                • +
              From a33461433c73b774e6409295c43b89c90ad584f2 Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Thu, 23 Jan 2014 17:56:00 +0530 Subject: [PATCH 12/37] [IMP]improved kanban state as boostrap btn and dorpdown bzr revid: mba@tinyerp.com-20140123122600-hqo3g9c5l6r24o3t --- addons/web/static/src/css/base.css | 58 ++++++++++++--------------- addons/web/static/src/css/base.sass | 44 +++++++++----------- addons/web/static/src/js/view_form.js | 6 +-- addons/web/static/src/xml/base.xml | 11 +++-- 4 files changed, 54 insertions(+), 65 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 7bee0019028..1510a4c4b0a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -659,10 +659,6 @@ display: block; color: gray; } -.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active { - border-bottom: none; - padding-bottom: 1px; -} .openerp .oe_notebook > li.ui-tabs-active > a { color: #4c4c4c; } @@ -688,6 +684,10 @@ background-color: #eeeeee; border-color: #eeeeee #eeeeee #dddddd; } +.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active { + border-bottom: none; + padding-bottom: 1px; +} .openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover { background-color: white; border: 1px solid #dddddd; @@ -3575,40 +3575,34 @@ h5 { color: #eeeeee; } -.dropdown-menu.with-arrow { +.dropdown-menu.state { background: white; background: white !important; + min-width: 73px; } -.dropdown-menu.with-arrow:before { - position: absolute; - top: -12px; - left: 0px; - display: inline-block; - border-right: 12px solid transparent; - border-bottom: 12px solid #cccccc; - border-left: 12px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - content: ""; -} - -.dropdown-menu.with-arrow:after { - position: absolute; - top: -11px; - left: 1px; - display: inline-block; - border-right: 11px solid transparent; - border-bottom: 11px solid white; - border-left: 11px solid transparent; - content: ""; -} - -.dropdown-menu.with-arrow li a { - color: black; -} -.dropdown-menu.with-arrow li a, .dropdown-menu.with-arrow li a:hover, .dropdown-menu.with-arrow li a:focus { +.dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus { text-decoration: none; + color: #333333; + padding-left: 5px; + padding-right: 0px; } + +.btn.btn-xs.btn-danger { + color: white; + text-decoration: none !important; +} + +.btn.btn-xs.btn-default { + color: #333333; + text-decoration: none !important; +} + +.btn.btn-xs.btn-success { + color: white; + text-decoration: none !important; +} + .ui-icon { width: 18px; height: 18px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 291ecc5ca79..c9f3e6f51b1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2848,32 +2848,24 @@ h5 li a,a:hover,a:focus color: #eeeeee -.dropdown-menu.with-arrow - background: #FFF - background: #FFF !important -.dropdown-menu.with-arrow:before - position: absolute - top: -12px - left: 0px - display: inline-block - border-right: 12px solid transparent - border-bottom: 12px solid #ccc - border-left: 12px solid transparent - border-bottom-color: rgba(0, 0, 0, 0.2) - content: '' -.dropdown-menu.with-arrow:after - position: absolute - top: -11px - left: 1px - display: inline-block - border-right: 11px solid transparent - border-bottom: 11px solid #ffffff - border-left: 11px solid transparent - content: '' -.dropdown-menu.with-arrow li a - color: #000 -.dropdown-menu.with-arrow li a, .dropdown-menu.with-arrow li a:hover, .dropdown-menu.with-arrow li a:focus - text-decoration: none; +.dropdown-menu.state + background: white + background: white !important + min-width: 73px +.dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus + text-decoration: none + color: #333 + padding-left: 5px + padding-right: 0px +.btn.btn-xs.btn-danger + color: #FFF + text-decoration: none !important +.btn.btn-xs.btn-default + color: #333 + text-decoration: none !important +.btn.btn-xs.btn-success + color: #FFF + text-decoration: none !important // End hack }}} // Hack for ui icon {{{ diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 52cf198963c..40b867ed96b 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2339,9 +2339,9 @@ instance.web.Legend = instance.web.Widget.extend({ this.options = options; }, prepare_kanban_state_legend: function(){ - return [{ 'name': 'normal', 'legend_name': ' Normal', 'legend': '' }, - { 'name': 'blocked', 'legend_name': ' Blocked', 'legend': '' }, - { 'name': 'done', 'legend_name': ' Done', 'legend': '' }] + return [{ 'name': 'normal', 'legend_name': ' Normal', 'legend_class': 'btn-default' }, + { 'name': 'blocked', 'legend_name': ' Blocked', 'legend_class': 'btn-danger' }, + { 'name': 'done', 'legend_name': ' Done', 'legend_class': 'btn-success' }] }, prepare_priority_legend: function(){ var data = []; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 4286f7cf689..42af6859b1e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1035,14 +1035,17 @@ - - + + + + + Toggle Dropdown -
                + From d95e3835e2662f29247a42ef6aa962764b8ca597 Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Fri, 14 Feb 2014 17:19:04 +0530 Subject: [PATCH 13/37] [IMP]priority widget and dropdown_select widget for direct write instead call method bzr revid: mba@tinyerp.com-20140214114904-x2fg98k7xo8lxe4w --- addons/web/static/src/js/view_form.js | 17 +++++++++-------- addons/web_kanban/static/src/js/kanban.js | 5 +++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 77f6f2809a2..3ef2aea706b 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2332,14 +2332,13 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we }); instance.web.Legend = instance.web.Widget.extend({ - init: function (parent, dataset, options) { + init: function (parent, dataset) { this._super(parent); this.parent = parent; this.dataset = dataset; - this.options = options; }, prepare_kanban_state_legend: function(){ - return [{ 'name': 'normal', 'legend_name': ' Normal', 'legend_class': 'btn-default' }, + return [{ 'name': 'normal', 'legend_name': ' Normal', 'legend_class': 'btn-default' }, { 'name': 'blocked', 'legend_name': ' Blocked', 'legend_class': 'btn-danger' }, { 'name': 'done', 'legend_name': ' Done', 'legend_class': 'btn-success' }] }, @@ -2362,7 +2361,7 @@ instance.web.Legend = instance.web.Widget.extend({ return data; }, prepare_data: function() { - var self =this; + var self =this; if (this.parent.name == 'kanban_state'){ return self.prepare_kanban_state_legend(); } @@ -2388,8 +2387,9 @@ instance.web.Legend = instance.web.Widget.extend({ var self = this; var li = $(e.target).closest( "li" ); if (li.length){ - var value = li.data('value'); - return self.dataset.call_button(self.options.action, [self.record_id, value, self.dataset.get_context()]).done(self.parent.reload_record.bind(self.parent)); + var value = {}; + value[self.parent.name] = String(li.data('value')); + return self.dataset._model.call('write', [[self.record_id], value, self.dataset.get_context()]).done(self.parent.reload_record.bind(self.parent)); } } }); @@ -2397,7 +2397,7 @@ instance.web.Legend = instance.web.Widget.extend({ instance.web.form.Legend = instance.web.form.FieldChar.extend({ init: function (field_manager, node) { this._super(field_manager, node); - this.legend = new instance.web.Legend(this, this.view.dataset, py.eval(node.attrs.options)); + this.legend = new instance.web.Legend(this, this.view.dataset); }, reload_record: function(){ this.view.reload(); @@ -5965,7 +5965,8 @@ instance.web.form.widgets = new instance.web.Registry({ 'monetary': 'instance.web.form.FieldMonetary', 'many2many_checkboxes': 'instance.web.form.FieldMany2ManyCheckBoxes', 'x2many_counter': 'instance.web.form.X2ManyCounter', - 'legend':'instance.web.form.Legend' + 'priority':'instance.web.form.Legend', + 'dropdown_selection':'instance.web.form.Legend' }); /** diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 82c434842af..47a21de7eac 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1265,7 +1265,7 @@ instance.web_kanban.Legend = instance.web_kanban.AbstractField.extend({ this._super.apply(this, arguments); this.name = $node.attr('name') this.parent = parent; - this.legend = new instance.web.Legend(this, parent.view.dataset, this.options); + this.legend = new instance.web.Legend(this, parent.view.dataset); }, reload_record: function(){ this.parent.do_reload(); @@ -1280,7 +1280,8 @@ instance.web_kanban.Legend = instance.web_kanban.AbstractField.extend({ instance.web_kanban.fields_registry = new instance.web.Registry({}); -instance.web_kanban.fields_registry.add('legend','instance.web_kanban.Legend'); +instance.web_kanban.fields_registry.add('priority','instance.web_kanban.Legend'); +instance.web_kanban.fields_registry.add('dropdown_selection','instance.web_kanban.Legend'); }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: From cea18d95caea232fec718a47709ef2142d9e9e37 Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Wed, 19 Feb 2014 15:22:42 +0530 Subject: [PATCH 14/37] [IMP]save record on status change bzr revid: mba@tinyerp.com-20140219095242-jppybyffehlqqmy0 --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- addons/web/static/src/js/view_form.js | 18 ++++++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 9bd1f495f1e..430c11c19b3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3437,7 +3437,7 @@ body.oe_single_form .oe_single_form_container { .dropdown-menu.state { background: white; background: white !important; - min-width: 73px; + min-width: 100%; } .dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 6a065668376..84db0ff5da7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2777,7 +2777,7 @@ body.oe_single_form .dropdown-menu.state background: white background: white !important - min-width: 73px + min-width: 100% .dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus text-decoration: none color: #333 diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 3ef2aea706b..c10e2b56d27 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2338,9 +2338,9 @@ instance.web.Legend = instance.web.Widget.extend({ this.dataset = dataset; }, prepare_kanban_state_legend: function(){ - return [{ 'name': 'normal', 'legend_name': ' Normal', 'legend_class': 'btn-default' }, + return [{ 'name': 'normal', 'legend_name': ' In Progress', 'legend_class': 'btn-default' }, { 'name': 'blocked', 'legend_name': ' Blocked', 'legend_class': 'btn-danger' }, - { 'name': 'done', 'legend_name': ' Done', 'legend_class': 'btn-success' }] + { 'name': 'done', 'legend_name': ' Ready', 'legend_class': 'btn-success' }] }, prepare_priority_legend: function(){ var data = []; @@ -2379,9 +2379,7 @@ instance.web.Legend = instance.web.Widget.extend({ this.parent.$el.html(content); else this.parent.$el = $(content); - if (!this.parent.get("effective_readonly")){ - this.parent.$el.find('.oe_legend').click(self.do_action.bind(self)); - } + this.parent.$el.find('.oe_legend').click(self.do_action.bind(self)); }, do_action: function(e){ var self = this; @@ -2389,7 +2387,15 @@ instance.web.Legend = instance.web.Widget.extend({ if (li.length){ var value = {}; value[self.parent.name] = String(li.data('value')); - return self.dataset._model.call('write', [[self.record_id], value, self.dataset.get_context()]).done(self.parent.reload_record.bind(self.parent)); + if (self.record_id){ + return self.dataset._model.call('write', [[self.record_id], value, self.dataset.get_context()]).done(self.parent.reload_record.bind(self.parent)); + } else { + return self.parent.view.on_button_save().done(function(result) { + if (result){ + self.dataset._model.call('write', [[result], value, self.dataset.get_context()]).done(self.parent.reload_record.bind(self.parent)); + } + }); + } } } }); From fd4b54a9cfedcbffa08c10494cac3a8a8db6760b Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Wed, 19 Feb 2014 18:58:51 +0530 Subject: [PATCH 15/37] [IMP]create four different widget for priority and dropdown_select for kanban and form view bzr revid: mba@tinyerp.com-20140219132851-vyynhi29hla4k5ly --- addons/web/static/src/js/view_form.js | 110 ++++++++++++---------- addons/web/static/src/xml/base.xml | 16 ++-- addons/web_kanban/static/src/js/kanban.js | 80 ++++++++++++++-- 3 files changed, 138 insertions(+), 68 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c10e2b56d27..fd237da6e7d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2331,20 +2331,53 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we } }); -instance.web.Legend = instance.web.Widget.extend({ - init: function (parent, dataset) { - this._super(parent); - this.parent = parent; - this.dataset = dataset; +instance.web.form.dropdown_selection = instance.web.form.FieldChar.extend({ + init: function (field_manager, node) { + this._super(field_manager, node); }, - prepare_kanban_state_legend: function(){ - return [{ 'name': 'normal', 'legend_name': ' In Progress', 'legend_class': 'btn-default' }, - { 'name': 'blocked', 'legend_name': ' Blocked', 'legend_class': 'btn-danger' }, - { 'name': 'done', 'legend_name': ' Ready', 'legend_class': 'btn-success' }] + prepare_dropdown_selection: function(){ + return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_class': 'btn-default' }, + { 'name': 'blocked', 'state_name': ' Blocked', 'state_class': 'btn-danger' }, + { 'name': 'done', 'state_name': ' Ready', 'state_class': 'btn-success' }] }, - prepare_priority_legend: function(){ + render_value: function() { + var self = this; + var data = {'widget': self } + self.record_id = self.view.datarecord.id; + data['states'] = self.prepare_dropdown_selection(); + var content = QWeb.render("dropdown_selection", data); + this.$el.html(content); + this.$el.find('.oe_legend').click(self.do_action.bind(self)); + }, + do_action: function(e){ + var self = this; + var li = $(e.target).closest( "li" ); + if (li.length){ + var value = {}; + value[self.name] = String(li.data('value')); + if (self.record_id){ + return self.view.dataset._model.call('write', [[self.record_id], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self)); + } else { + return self.view.on_button_save().done(function(result) { + if (result) { + self.view.dataset._model.call('write', [[result], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self)); + } + }); + } + } + }, + reload_record: function(){ + this.view.reload(); + }, +}); + +instance.web.form.priority = instance.web.form.FieldChar.extend({ + init: function (field_manager, node) { + this._super(field_manager, node); + }, + prepare_priority: function(){ var data = []; - var selection = this.parent.field.selection || []; + var selection = this.field.selection || []; _.map(selection, function(res){ value = { 'name': res[0], @@ -2360,62 +2393,37 @@ instance.web.Legend = instance.web.Widget.extend({ }); return data; }, - prepare_data: function() { - var self =this; - if (this.parent.name == 'kanban_state'){ - return self.prepare_kanban_state_legend(); - } - if (this.parent.name == 'priority'){ - return self.prepare_priority_legend(); - } - }, - render_value: function(record_id, data) { + render_value: function() { var self = this; - self.record_id = record_id; - var legend = this.prepare_data(); - data['legends'] = legend; - var content = QWeb.render("Legend."+ self.parent.name, data); - if (data.view_mode === 'form') - this.parent.$el.html(content); - else - this.parent.$el = $(content); - this.parent.$el.find('.oe_legend').click(self.do_action.bind(self)); + var data = {'widget': self } + self.record_id = self.view.datarecord.id; + data['legends'] = self.prepare_priority(); + var content = QWeb.render("priority", data); + this.$el.html(content); + this.$el.find('.oe_legend').click(self.do_action.bind(self)); }, do_action: function(e){ var self = this; var li = $(e.target).closest( "li" ); if (li.length){ var value = {}; - value[self.parent.name] = String(li.data('value')); + value[self.name] = String(li.data('value')); if (self.record_id){ - return self.dataset._model.call('write', [[self.record_id], value, self.dataset.get_context()]).done(self.parent.reload_record.bind(self.parent)); + return self.view.dataset._model.call('write', [[self.record_id], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self)); } else { - return self.parent.view.on_button_save().done(function(result) { - if (result){ - self.dataset._model.call('write', [[result], value, self.dataset.get_context()]).done(self.parent.reload_record.bind(self.parent)); + return self.view.on_button_save().done(function(result) { + if (result) { + self.view.dataset._model.call('write', [[result], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self)); } }); } } - } -}); - -instance.web.form.Legend = instance.web.form.FieldChar.extend({ - init: function (field_manager, node) { - this._super(field_manager, node); - this.legend = new instance.web.Legend(this, this.view.dataset); }, reload_record: function(){ this.view.reload(); }, - render_value: function() { - var self = this; - self.legend.render_value(this.view.datarecord.id, { - 'widget': self, - 'view_mode':'form' - }); - }, }); + instance.web.form.FieldID = instance.web.form.FieldChar.extend({ process_modifiers: function () { this._super(); @@ -5971,8 +5979,8 @@ instance.web.form.widgets = new instance.web.Registry({ 'monetary': 'instance.web.form.FieldMonetary', 'many2many_checkboxes': 'instance.web.form.FieldMany2ManyCheckBoxes', 'x2many_counter': 'instance.web.form.X2ManyCounter', - 'priority':'instance.web.form.Legend', - 'dropdown_selection':'instance.web.form.Legend' + 'priority':'instance.web.form.priority', + 'dropdown_selection':'instance.web.form.dropdown_selection' }); /** diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 589ef50741b..e804b3f0f53 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -992,26 +992,26 @@ - + - - - - + + + + Toggle Dropdown - +
                  diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 47a21de7eac..1be03b511ad 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1260,28 +1260,90 @@ instance.web_kanban.AbstractField = instance.web.Widget.extend(instance.web_kanb }, }); -instance.web_kanban.Legend = instance.web_kanban.AbstractField.extend({ +instance.web_kanban.priority = instance.web_kanban.AbstractField.extend({ init: function(parent, field, $node) { this._super.apply(this, arguments); this.name = $node.attr('name') this.parent = parent; - this.legend = new instance.web.Legend(this, parent.view.dataset); }, - reload_record: function(){ - this.parent.do_reload(); + prepare_priority: function(){ + var data = []; + var selection = this.field.selection || []; + _.map(selection, function(res){ + value = { + 'name': res[0], + 'legend_name': res[1] + } + if (res[0] == '0') { + value['legend'] = ''; + value['legend_name'] = 'Set the Priority'; + } else { + value['legend'] = ''; + } + data.push(value) + }); + return data; }, renderElement: function() { var self = this; - self.legend.render_value(self.parent.id, { - 'widget': self, - }); + self.record_id = self.parent.id; + var data = {'widget': self } + data['legends'] = self.prepare_priority(); + var content = QWeb.render("priority", data); + this.$el = $(content); + this.$el.find('.oe_legend').click(self.do_action.bind(self)); + }, + do_action: function(e){ + var self = this; + var li = $(e.target).closest( "li" ); + if (li.length){ + var value = {}; + value[self.name] = String(li.data('value')); + return self.parent.view.dataset._model.call('write', [[self.record_id], value, self.parent.view.dataset.get_context()]).done(self.reload_record.bind(self.parent)); + } + }, + reload_record: function(){ + this.do_reload(); }, }); +instance.web_kanban.dropdown_selection = instance.web_kanban.AbstractField.extend({ + init: function(parent, field, $node) { + this._super.apply(this, arguments); + this.name = $node.attr('name') + this.parent = parent; + }, + prepare_dropdown_selection: function(){ + return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_class': 'btn-default' }, + { 'name': 'blocked', 'state_name': ' Blocked', 'state_class': 'btn-danger' }, + { 'name': 'done', 'state_name': ' Ready', 'state_class': 'btn-success' }] + }, + renderElement: function() { + var self = this; + self.record_id = self.parent.id; + var data = {'widget': self } + data['states'] = self.prepare_dropdown_selection(); + var content = QWeb.render("dropdown_selection", data); + this.$el = $(content); + this.$el.find('.oe_legend').click(self.do_action.bind(self)); + }, + do_action: function(e){ + var self = this; + var li = $(e.target).closest( "li" ); + if (li.length){ + var value = {}; + value[self.name] = String(li.data('value')); + return self.parent.view.dataset._model.call('write', [[self.record_id], value, self.parent.view.dataset.get_context()]).done(self.reload_record.bind(self.parent)); + } + }, + reload_record: function(){ + this.do_reload(); + }, +}); instance.web_kanban.fields_registry = new instance.web.Registry({}); -instance.web_kanban.fields_registry.add('priority','instance.web_kanban.Legend'); -instance.web_kanban.fields_registry.add('dropdown_selection','instance.web_kanban.Legend'); +instance.web_kanban.fields_registry.add('priority','instance.web_kanban.priority'); +instance.web_kanban.fields_registry.add('dropdown_selection','instance.web_kanban.dropdown_selection'); }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: From 26f27f7be085e5311eae5e82275daed2bd927a1d Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Thu, 20 Feb 2014 11:32:09 +0530 Subject: [PATCH 16/37] [IMP]fix typo bzr revid: mba@tinyerp.com-20140220060209-3j6vxpbdy47ahg5o --- addons/web/static/src/js/view_form.js | 30 +++++++++++------------ addons/web_kanban/static/src/js/kanban.js | 24 +++++++++--------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index fd237da6e7d..9e08c7684f1 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2335,7 +2335,7 @@ instance.web.form.dropdown_selection = instance.web.form.FieldChar.extend({ init: function (field_manager, node) { this._super(field_manager, node); }, - prepare_dropdown_selection: function(){ + prepare_dropdown_selection: function() { return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_class': 'btn-default' }, { 'name': 'blocked', 'state_name': ' Blocked', 'state_class': 'btn-danger' }, { 'name': 'done', 'state_name': ' Ready', 'state_class': 'btn-success' }] @@ -2345,17 +2345,16 @@ instance.web.form.dropdown_selection = instance.web.form.FieldChar.extend({ var data = {'widget': self } self.record_id = self.view.datarecord.id; data['states'] = self.prepare_dropdown_selection(); - var content = QWeb.render("dropdown_selection", data); - this.$el.html(content); + this.$el.html(QWeb.render("dropdown_selection", data)); this.$el.find('.oe_legend').click(self.do_action.bind(self)); }, - do_action: function(e){ + do_action: function(e) { var self = this; var li = $(e.target).closest( "li" ); - if (li.length){ + if (li.length) { var value = {}; value[self.name] = String(li.data('value')); - if (self.record_id){ + if (self.record_id) { return self.view.dataset._model.call('write', [[self.record_id], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self)); } else { return self.view.on_button_save().done(function(result) { @@ -2366,7 +2365,7 @@ instance.web.form.dropdown_selection = instance.web.form.FieldChar.extend({ } } }, - reload_record: function(){ + reload_record: function() { this.view.reload(); }, }); @@ -2375,15 +2374,15 @@ instance.web.form.priority = instance.web.form.FieldChar.extend({ init: function (field_manager, node) { this._super(field_manager, node); }, - prepare_priority: function(){ + prepare_priority: function() { var data = []; var selection = this.field.selection || []; - _.map(selection, function(res){ + _.map(selection, function(res) { value = { 'name': res[0], 'legend_name': res[1] } - if (res[0] == '0'){ + if (res[0] == '0') { value['legend']= ''; value['legend_name'] = 'Set the Priority'; }else{ @@ -2398,17 +2397,16 @@ instance.web.form.priority = instance.web.form.FieldChar.extend({ var data = {'widget': self } self.record_id = self.view.datarecord.id; data['legends'] = self.prepare_priority(); - var content = QWeb.render("priority", data); - this.$el.html(content); + this.$el.html(QWeb.render("priority", data)); this.$el.find('.oe_legend').click(self.do_action.bind(self)); }, - do_action: function(e){ + do_action: function(e) { var self = this; var li = $(e.target).closest( "li" ); - if (li.length){ + if (li.length) { var value = {}; value[self.name] = String(li.data('value')); - if (self.record_id){ + if (self.record_id) { return self.view.dataset._model.call('write', [[self.record_id], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self)); } else { return self.view.on_button_save().done(function(result) { @@ -2419,7 +2417,7 @@ instance.web.form.priority = instance.web.form.FieldChar.extend({ } } }, - reload_record: function(){ + reload_record: function() { this.view.reload(); }, }); diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 1be03b511ad..2d2245bcf41 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1266,10 +1266,10 @@ instance.web_kanban.priority = instance.web_kanban.AbstractField.extend({ this.name = $node.attr('name') this.parent = parent; }, - prepare_priority: function(){ + prepare_priority: function() { var data = []; var selection = this.field.selection || []; - _.map(selection, function(res){ + _.map(selection, function(res) { value = { 'name': res[0], 'legend_name': res[1] @@ -1289,20 +1289,19 @@ instance.web_kanban.priority = instance.web_kanban.AbstractField.extend({ self.record_id = self.parent.id; var data = {'widget': self } data['legends'] = self.prepare_priority(); - var content = QWeb.render("priority", data); - this.$el = $(content); + this.$el = $(QWeb.render("priority", data)); this.$el.find('.oe_legend').click(self.do_action.bind(self)); }, - do_action: function(e){ + do_action: function(e) { var self = this; var li = $(e.target).closest( "li" ); - if (li.length){ + if (li.length) { var value = {}; value[self.name] = String(li.data('value')); return self.parent.view.dataset._model.call('write', [[self.record_id], value, self.parent.view.dataset.get_context()]).done(self.reload_record.bind(self.parent)); } }, - reload_record: function(){ + reload_record: function() { this.do_reload(); }, }); @@ -1313,7 +1312,7 @@ instance.web_kanban.dropdown_selection = instance.web_kanban.AbstractField.exten this.name = $node.attr('name') this.parent = parent; }, - prepare_dropdown_selection: function(){ + prepare_dropdown_selection: function() { return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_class': 'btn-default' }, { 'name': 'blocked', 'state_name': ' Blocked', 'state_class': 'btn-danger' }, { 'name': 'done', 'state_name': ' Ready', 'state_class': 'btn-success' }] @@ -1323,20 +1322,19 @@ instance.web_kanban.dropdown_selection = instance.web_kanban.AbstractField.exten self.record_id = self.parent.id; var data = {'widget': self } data['states'] = self.prepare_dropdown_selection(); - var content = QWeb.render("dropdown_selection", data); - this.$el = $(content); + this.$el = $(QWeb.render("dropdown_selection", data)); this.$el.find('.oe_legend').click(self.do_action.bind(self)); }, - do_action: function(e){ + do_action: function(e) { var self = this; var li = $(e.target).closest( "li" ); - if (li.length){ + if (li.length) { var value = {}; value[self.name] = String(li.data('value')); return self.parent.view.dataset._model.call('write', [[self.record_id], value, self.parent.view.dataset.get_context()]).done(self.reload_record.bind(self.parent)); } }, - reload_record: function(){ + reload_record: function() { this.do_reload(); }, }); From cdf0d284695e812f92ef03f63733ecf9acaacc0a Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Fri, 21 Feb 2014 17:51:46 +0530 Subject: [PATCH 17/37] [IMP]fix typo bzr revid: mba@tinyerp.com-20140221122146-p5uopfg2djso3ii2 --- addons/web/static/src/js/view_form.js | 8 ++++---- addons/web_kanban/static/src/js/kanban.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 9e08c7684f1..e818e142fd2 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2331,7 +2331,7 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we } }); -instance.web.form.dropdown_selection = instance.web.form.FieldChar.extend({ +instance.web.form.Dropdown_Selection = instance.web.form.FieldChar.extend({ init: function (field_manager, node) { this._super(field_manager, node); }, @@ -2370,7 +2370,7 @@ instance.web.form.dropdown_selection = instance.web.form.FieldChar.extend({ }, }); -instance.web.form.priority = instance.web.form.FieldChar.extend({ +instance.web.form.Priority = instance.web.form.FieldChar.extend({ init: function (field_manager, node) { this._super(field_manager, node); }, @@ -5977,8 +5977,8 @@ instance.web.form.widgets = new instance.web.Registry({ 'monetary': 'instance.web.form.FieldMonetary', 'many2many_checkboxes': 'instance.web.form.FieldMany2ManyCheckBoxes', 'x2many_counter': 'instance.web.form.X2ManyCounter', - 'priority':'instance.web.form.priority', - 'dropdown_selection':'instance.web.form.dropdown_selection' + 'priority':'instance.web.form.Priority', + 'dropdown_selection':'instance.web.form.Dropdown_Selection' }); /** diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 2d2245bcf41..cf6256b77c7 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1260,7 +1260,7 @@ instance.web_kanban.AbstractField = instance.web.Widget.extend(instance.web_kanb }, }); -instance.web_kanban.priority = instance.web_kanban.AbstractField.extend({ +instance.web_kanban.Priority = instance.web_kanban.AbstractField.extend({ init: function(parent, field, $node) { this._super.apply(this, arguments); this.name = $node.attr('name') @@ -1306,7 +1306,7 @@ instance.web_kanban.priority = instance.web_kanban.AbstractField.extend({ }, }); -instance.web_kanban.dropdown_selection = instance.web_kanban.AbstractField.extend({ +instance.web_kanban.Dropdown_Selection = instance.web_kanban.AbstractField.extend({ init: function(parent, field, $node) { this._super.apply(this, arguments); this.name = $node.attr('name') @@ -1340,8 +1340,8 @@ instance.web_kanban.dropdown_selection = instance.web_kanban.AbstractField.exten }); instance.web_kanban.fields_registry = new instance.web.Registry({}); -instance.web_kanban.fields_registry.add('priority','instance.web_kanban.priority'); -instance.web_kanban.fields_registry.add('dropdown_selection','instance.web_kanban.dropdown_selection'); +instance.web_kanban.fields_registry.add('priority','instance.web_kanban.Priority'); +instance.web_kanban.fields_registry.add('dropdown_selection','instance.web_kanban.Dropdown_Selection'); }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: From d8544c4960c6fc9ba86ea60f391acac392525098 Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Fri, 21 Feb 2014 18:59:56 +0530 Subject: [PATCH 18/37] [IMP]improve the tooltip on star bzr revid: mba@tinyerp.com-20140221132956-w6vrflrta8rn51sf --- addons/web/static/src/js/view_form.js | 3 +-- addons/web/static/src/xml/base.xml | 12 ++++++------ addons/web_kanban/static/src/js/kanban.js | 1 - 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e818e142fd2..0252ca640cd 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2384,8 +2384,7 @@ instance.web.form.Priority = instance.web.form.FieldChar.extend({ } if (res[0] == '0') { value['legend']= ''; - value['legend_name'] = 'Set the Priority'; - }else{ + } else { value['legend']= ''; } data.push(value) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index e804b3f0f53..dc305b03af6 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1013,14 +1013,14 @@
                    - - -
                    • + + +
                    • - - -
                    • + + +
                  diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index cf6256b77c7..b84c06e5789 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1276,7 +1276,6 @@ instance.web_kanban.Priority = instance.web_kanban.AbstractField.extend({ } if (res[0] == '0') { value['legend'] = ''; - value['legend_name'] = 'Set the Priority'; } else { value['legend'] = ''; } From 4a220f70c9fd08ab7c31afba97ca94ec2d73248e Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Wed, 26 Feb 2014 15:35:09 +0530 Subject: [PATCH 19/37] [IMP]priority widget on click star bzr revid: mba@tinyerp.com-20140226100509-ra9n6ia24b7ofc22 --- addons/web/static/src/js/view_form.js | 9 ++++++++- addons/web/static/src/xml/base.xml | 2 +- addons/web_kanban/static/src/js/kanban.js | 9 ++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0252ca640cd..24c64ab2dfd 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2404,7 +2404,14 @@ instance.web.form.Priority = instance.web.form.FieldChar.extend({ var li = $(e.target).closest( "li" ); if (li.length) { var value = {}; - value[self.name] = String(li.data('value')); + if (self.val == li.data('value') && self.check_star) { + value[self.name] = String(li.data('value') - 1); + self.check_star = false + } else { + value[self.name] = String(li.data('value')); + self.check_star = true; + } + self.val = li.data('value') if (self.record_id) { return self.view.dataset._model.call('write', [[self.record_id], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self)); } else { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index dc305b03af6..8cdc1e38621 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1015,7 +1015,7 @@
                    -
                    • +
                    • diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index b84c06e5789..78d59163735 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1296,7 +1296,14 @@ instance.web_kanban.Priority = instance.web_kanban.AbstractField.extend({ var li = $(e.target).closest( "li" ); if (li.length) { var value = {}; - value[self.name] = String(li.data('value')); + if (self.parent.val == li.data('value') && self.parent.check_star) { + value[self.name] = String(li.data('value') - 1); + self.parent.check_star = false + } else { + value[self.name] = String(li.data('value')); + self.parent.check_star = true; + } + self.parent.val = li.data('value') return self.parent.view.dataset._model.call('write', [[self.record_id], value, self.parent.view.dataset.get_context()]).done(self.reload_record.bind(self.parent)); } }, From da188564635df8338b38bd88162cdc2dc6d8862b Mon Sep 17 00:00:00 2001 From: "Mahendra Barad (OpenERP)" Date: Wed, 26 Feb 2014 16:46:46 +0530 Subject: [PATCH 20/37] [IMP]fix typo bzr revid: mba@tinyerp.com-20140226111646-e8f7lnawrw082i03 --- addons/web/static/src/js/view_form.js | 8 ++++---- addons/web/static/src/xml/base.xml | 4 ++-- addons/web_kanban/static/src/js/kanban.js | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 24c64ab2dfd..5e109b927e9 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2331,7 +2331,7 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we } }); -instance.web.form.Dropdown_Selection = instance.web.form.FieldChar.extend({ +instance.web.form.DropdownSelection = instance.web.form.FieldChar.extend({ init: function (field_manager, node) { this._super(field_manager, node); }, @@ -2345,7 +2345,7 @@ instance.web.form.Dropdown_Selection = instance.web.form.FieldChar.extend({ var data = {'widget': self } self.record_id = self.view.datarecord.id; data['states'] = self.prepare_dropdown_selection(); - this.$el.html(QWeb.render("dropdown_selection", data)); + this.$el.html(QWeb.render("DropdownSelection", data)); this.$el.find('.oe_legend').click(self.do_action.bind(self)); }, do_action: function(e) { @@ -2396,7 +2396,7 @@ instance.web.form.Priority = instance.web.form.FieldChar.extend({ var data = {'widget': self } self.record_id = self.view.datarecord.id; data['legends'] = self.prepare_priority(); - this.$el.html(QWeb.render("priority", data)); + this.$el.html(QWeb.render("Priority", data)); this.$el.find('.oe_legend').click(self.do_action.bind(self)); }, do_action: function(e) { @@ -5984,7 +5984,7 @@ instance.web.form.widgets = new instance.web.Registry({ 'many2many_checkboxes': 'instance.web.form.FieldMany2ManyCheckBoxes', 'x2many_counter': 'instance.web.form.X2ManyCounter', 'priority':'instance.web.form.Priority', - 'dropdown_selection':'instance.web.form.Dropdown_Selection' + 'dropdown_selection':'instance.web.form.DropdownSelection' }); /** diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 8cdc1e38621..1c514072792 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -992,7 +992,7 @@ - + @@ -1011,7 +1011,7 @@
                  - +
                    diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 78d59163735..e8343034e62 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1288,7 +1288,7 @@ instance.web_kanban.Priority = instance.web_kanban.AbstractField.extend({ self.record_id = self.parent.id; var data = {'widget': self } data['legends'] = self.prepare_priority(); - this.$el = $(QWeb.render("priority", data)); + this.$el = $(QWeb.render("Priority", data)); this.$el.find('.oe_legend').click(self.do_action.bind(self)); }, do_action: function(e) { @@ -1312,7 +1312,7 @@ instance.web_kanban.Priority = instance.web_kanban.AbstractField.extend({ }, }); -instance.web_kanban.Dropdown_Selection = instance.web_kanban.AbstractField.extend({ +instance.web_kanban.DropdownSelection = instance.web_kanban.AbstractField.extend({ init: function(parent, field, $node) { this._super.apply(this, arguments); this.name = $node.attr('name') @@ -1328,7 +1328,7 @@ instance.web_kanban.Dropdown_Selection = instance.web_kanban.AbstractField.exten self.record_id = self.parent.id; var data = {'widget': self } data['states'] = self.prepare_dropdown_selection(); - this.$el = $(QWeb.render("dropdown_selection", data)); + this.$el = $(QWeb.render("DropdownSelection", data)); this.$el.find('.oe_legend').click(self.do_action.bind(self)); }, do_action: function(e) { @@ -1347,7 +1347,7 @@ instance.web_kanban.Dropdown_Selection = instance.web_kanban.AbstractField.exten instance.web_kanban.fields_registry = new instance.web.Registry({}); instance.web_kanban.fields_registry.add('priority','instance.web_kanban.Priority'); -instance.web_kanban.fields_registry.add('dropdown_selection','instance.web_kanban.Dropdown_Selection'); +instance.web_kanban.fields_registry.add('dropdown_selection','instance.web_kanban.DropdownSelection'); }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: From 955f6c4cd7a73777646bd205ab2bc9799148dff0 Mon Sep 17 00:00:00 2001 From: Barad Mahendra Date: Tue, 18 Mar 2014 14:50:12 +0530 Subject: [PATCH 21/37] [IMP]improve dropdown bzr revid: mba@tinyerp.com-20140318092012-4ch33v0e4ej88t2z --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + addons/web/static/src/js/view_form.js | 6 +++--- addons/web/static/src/xml/base.xml | 11 +++++++---- addons/web_kanban/static/src/js/kanban.js | 6 +++--- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 69ca592298c..7e615c56a5e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3435,6 +3435,7 @@ body.oe_single_form .oe_single_form_container { background: white; background: white !important; min-width: 100%; + padding-right: 9px !important; } .dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 384bbcc3638..b034206c926 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2775,6 +2775,7 @@ body.oe_single_form background: white background: white !important min-width: 100% + padding-right: 10px !important .dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus text-decoration: none color: #333 diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index eb92a86dbd1..c9344ae137e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2337,9 +2337,9 @@ instance.web.form.DropdownSelection = instance.web.form.FieldChar.extend({ this._super(field_manager, node); }, prepare_dropdown_selection: function() { - return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_class': 'btn-default' }, - { 'name': 'blocked', 'state_name': ' Blocked', 'state_class': 'btn-danger' }, - { 'name': 'done', 'state_name': ' Ready', 'state_class': 'btn-success' }] + return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_icon': '' }, + { 'name': 'blocked', 'state_name': ' Blocked', 'state_icon': '' }, + { 'name': 'done', 'state_name': ' Ready', 'state_icon': '' }] }, render_value: function() { var self = this; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 6a0253d386b..505f3e5c02d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1011,9 +1011,9 @@ - - - + + + Toggle Dropdown @@ -1021,7 +1021,10 @@ diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index e8343034e62..09920738e19 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1319,9 +1319,9 @@ instance.web_kanban.DropdownSelection = instance.web_kanban.AbstractField.extend this.parent = parent; }, prepare_dropdown_selection: function() { - return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_class': 'btn-default' }, - { 'name': 'blocked', 'state_name': ' Blocked', 'state_class': 'btn-danger' }, - { 'name': 'done', 'state_name': ' Ready', 'state_class': 'btn-success' }] + return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_icon': '' }, + { 'name': 'blocked', 'state_name': ' Blocked', 'state_icon': '' }, + { 'name': 'done', 'state_name': ' Ready', 'state_icon': '' }] }, renderElement: function() { var self = this; From 0c621f477610d486a126d074d468942fe8deed53 Mon Sep 17 00:00:00 2001 From: Barad Mahendra Date: Tue, 18 Mar 2014 18:59:48 +0530 Subject: [PATCH 22/37] [IMP]improve the dropdown selection widget bzr revid: mba@tinyerp.com-20140318132948-85nnbkbwqri8gnld --- addons/web/static/src/css/base.css | 57 ++++++++++++------ addons/web/static/src/css/base.sass | 70 +++++++++++++++++------ addons/web/static/src/js/view_form.js | 6 +- addons/web/static/src/xml/base.xml | 8 +-- addons/web_kanban/static/src/js/kanban.js | 6 +- 5 files changed, 101 insertions(+), 46 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 7e615c56a5e..9bb218fceb2 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"); @@ -3431,33 +3431,58 @@ body.oe_single_form .oe_single_form_container { overflow: hidden !important; } } -.dropdown-menu.state { +.openerp .dropdown-menu.state { background: white; background: white !important; min-width: 100%; - padding-right: 9px !important; + padding-right: 10px !important; } - -.dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus { +.openerp .dropdown-menu.state li a, .openerp .dropdown-menu.state li a:hover, .openerp .dropdown-menu.state li a:focus { text-decoration: none; color: #333333; padding-left: 5px; padding-right: 0px; + font-size: 13px; } - -.btn.btn-xs.btn-danger { - color: white; - text-decoration: none !important; -} - -.btn.btn-xs.btn-default { +.openerp .btn.btn-xs.btn-default { color: #333333; text-decoration: none !important; + float: none; } - -.btn.btn-xs.btn-success { - color: white; - text-decoration: none !important; +.openerp .btn-group:focus, .openerp .btn-group:hover { + padding: 1px 5px; + border: 1px solid #98999b; + display: inline; +} +.openerp .status { + display: inline-block; + position: relative; + height: 12px; + width: 12px; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); + -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); + background-position: center center; + background-image: radial-gradient(#dddddd 0%, #aaaaaa 40%, #999999 100%); + background-image: -moz-radial-gradient(#dddddd 0%, #aaaaaa 40%, #999999 100%); + background-image: -webkit-radial-gradient(circle, #dddddd 0%, #aaaaaa 40%, #999999 100%); +} +.openerp .status.error { + background: #cc3333; + background-position: center center; + background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%); + background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%); + background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%); +} +.openerp .status.ok { + background: #44dd44; + background-position: center center; + background-image: radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%); + background-image: -moz-radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%); + background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44cc44 40%, #33bb33 100%); } .ui-icon { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b034206c926..c95272cddb5 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2771,25 +2771,57 @@ body.oe_single_form overflow: hidden !important // }}} -.dropdown-menu.state - background: white - background: white !important - min-width: 100% - padding-right: 10px !important -.dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus - text-decoration: none - color: #333 - padding-left: 5px - padding-right: 0px -.btn.btn-xs.btn-danger - color: #FFF - text-decoration: none !important -.btn.btn-xs.btn-default - color: #333 - text-decoration: none !important -.btn.btn-xs.btn-success - color: #FFF - text-decoration: none !important +.openerp + .dropdown-menu.state + background: white + background: white !important + min-width: 100% + padding-right: 10px !important + .dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus + text-decoration: none + color: #333 + padding-left: 5px + padding-right: 0px + font-size: 13px + .btn.btn-xs.btn-default + color: #333 + text-decoration: none !important + float: none + .btn-group:focus, .btn-group:hover + padding: 1px 5px + border: 1px solid #98999B + display: inline + + .status + display: inline-block + position: relative + height: 12px + width: 12px + -moz-border-radius: 6px + -webkit-border-radius: 6px + border-radius: 6px + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6) + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6) + -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6) + background-position: center center + background-image: radial-gradient(#dddddd 0%, #aaaaaa 40%, #999999 100%) + background-image: -moz-radial-gradient(#dddddd 0%, #aaaaaa 40%, #999999 100%) + background-image: -webkit-radial-gradient(circle, #dddddd 0%, #aaaaaa 40%, #999999 100%) + + .status.error + background: #cc3333 + background-position: center center + background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%) + background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%) + background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%) + + .status.ok + background: #44dd44 + background-position: center center + background-image: radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%) + background-image: -moz-radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%) + background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44cc44 40%, #33bb33 100%) + // End hack }}} // Hack for ui icon {{{ diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c9344ae137e..62367ad4fff 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2337,9 +2337,9 @@ instance.web.form.DropdownSelection = instance.web.form.FieldChar.extend({ this._super(field_manager, node); }, prepare_dropdown_selection: function() { - return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_icon': '' }, - { 'name': 'blocked', 'state_name': ' Blocked', 'state_icon': '' }, - { 'name': 'done', 'state_name': ' Ready', 'state_icon': '' }] + return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_icon': 'status' }, + { 'name': 'blocked', 'state_name': ' Blocked', 'state_icon': 'status error' }, + { 'name': 'done', 'state_name': ' Ready', 'state_icon': 'status ok' }] }, render_value: function() { var self = this; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 505f3e5c02d..f7dd56f7f5f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1011,9 +1011,8 @@ - - - + + Toggle Dropdown @@ -1022,8 +1021,7 @@
                  • - - +
                    • diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 09920738e19..b78b5c9db60 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1319,9 +1319,9 @@ instance.web_kanban.DropdownSelection = instance.web_kanban.AbstractField.extend this.parent = parent; }, prepare_dropdown_selection: function() { - return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_icon': '' }, - { 'name': 'blocked', 'state_name': ' Blocked', 'state_icon': '' }, - { 'name': 'done', 'state_name': ' Ready', 'state_icon': '' }] + return [{ 'name': 'normal', 'state_name': ' In Progress', 'state_icon': 'status' }, + { 'name': 'blocked', 'state_name': ' Blocked', 'state_icon': 'status error' }, + { 'name': 'done', 'state_name': ' Ready', 'state_icon': 'status ok' }] }, renderElement: function() { var self = this; From 002f663d2951e17d6cbc60a322a73f38c80d0e56 Mon Sep 17 00:00:00 2001 From: Barad Mahendra Date: Thu, 20 Mar 2014 11:25:24 +0530 Subject: [PATCH 23/37] [IMP]imrpove the style of dropdodwnselection bzr revid: mba@tinyerp.com-20140320055524-szvqd1d8i2sgpe2l --- addons/web/static/src/css/base.css | 16 ++++++++-------- addons/web/static/src/css/base.sass | 16 +++++++--------- addons/web/static/src/js/view_form.js | 4 ++++ addons/web/static/src/xml/base.xml | 6 +++--- addons/web_kanban/static/src/js/kanban.js | 3 +++ 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 9bb218fceb2..535a5be2b62 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3444,15 +3444,15 @@ body.oe_single_form .oe_single_form_container { padding-right: 0px; font-size: 13px; } -.openerp .btn.btn-xs.btn-default { - color: #333333; - text-decoration: none !important; - float: none; +.openerp .btn-group.state { + padding-top: 3px; } -.openerp .btn-group:focus, .openerp .btn-group:hover { - padding: 1px 5px; - border: 1px solid #98999b; - display: inline; +.openerp .btn-group.state a { + color: #333333; +} +.openerp .btn-group.state a:hover { + text-decoration: none; + color: #333333; } .openerp .status { display: inline-block; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c95272cddb5..8873752d4d2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2783,15 +2783,13 @@ body.oe_single_form padding-left: 5px padding-right: 0px font-size: 13px - .btn.btn-xs.btn-default - color: #333 - text-decoration: none !important - float: none - .btn-group:focus, .btn-group:hover - padding: 1px 5px - border: 1px solid #98999B - display: inline - + .btn-group.state + padding-top: 3px + .btn-group.state a + color: #333333 + .btn-group.state a:hover + text-decoration: none + color: #333333 .status display: inline-block position: relative diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 62367ad4fff..a7d8c09ea58 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2348,6 +2348,10 @@ instance.web.form.DropdownSelection = instance.web.form.FieldChar.extend({ data['states'] = self.prepare_dropdown_selection(); this.$el.html(QWeb.render("DropdownSelection", data)); this.$el.find('.oe_legend').click(self.do_action.bind(self)); + this.$el.on('mouseenter mouseleave', function(e) { + self.$el.find('.caret').toggleClass('hidden', e.type == 'mouseleave'); + }); + }, do_action: function(e) { var self = this; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f7dd56f7f5f..08d66d92567 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1009,11 +1009,11 @@                     - + - - + + Toggle Dropdown diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index b78b5c9db60..934de72c570 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1330,6 +1330,9 @@ instance.web_kanban.DropdownSelection = instance.web_kanban.AbstractField.extend data['states'] = self.prepare_dropdown_selection(); this.$el = $(QWeb.render("DropdownSelection", data)); this.$el.find('.oe_legend').click(self.do_action.bind(self)); + this.$el.on('mouseenter mouseleave', function(e) { + self.$el.find('.caret').toggleClass('hidden', e.type == 'mouseleave'); + }); }, do_action: function(e) { var self = this; From 007f39fd5bc7a615eb89a8bd4ffdec74b0815eab Mon Sep 17 00:00:00 2001 From: Barad Mahendra Date: Thu, 20 Mar 2014 14:31:47 +0530 Subject: [PATCH 24/37] [IMP]improve the css for dropdown selection bzr revid: mba@tinyerp.com-20140320090147-3znrq8fl5e64722d --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 5 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 535a5be2b62..3c7b2432b24 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3454,6 +3454,9 @@ body.oe_single_form .oe_single_form_container { text-decoration: none; color: #333333; } +.openerp .btn-group.state .dropdown-toggle { + -webkit-box-shadow: None; +} .openerp .status { display: inline-block; position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8873752d4d2..004188b5576 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2790,6 +2790,8 @@ body.oe_single_form .btn-group.state a:hover text-decoration: none color: #333333 + .btn-group.state .dropdown-toggle + -webkit-box-shadow: None .status display: inline-block position: relative From 002f33961e3e2930763fd1ccfae899b176f65677 Mon Sep 17 00:00:00 2001 From: Barad Mahendra Date: Thu, 3 Apr 2014 18:50:33 +0530 Subject: [PATCH 25/37] [IMP]fix typo bzr revid: mba@tinyerp.com-20140403132033-4b5yj6uy0mfokao5 --- 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 a2b7b34b6c8..f7527dac516 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -6066,7 +6066,7 @@ instance.web.form.widgets = new instance.web.Registry({ 'many2many_checkboxes': 'instance.web.form.FieldMany2ManyCheckBoxes', 'x2many_counter': 'instance.web.form.X2ManyCounter', 'priority':'instance.web.form.Priority', - 'dropdown_selection':'instance.web.form.DropdownSelection' + 'dropdown_selection':'instance.web.form.DropdownSelection', 'statinfo': 'instance.web.form.StatInfo', }); From daf69ced12fa500fa772952a6448f708bd631ecd Mon Sep 17 00:00:00 2001 From: "Rashmin Lumbhani (OpenERP)" Date: Fri, 11 Apr 2014 17:53:20 +0530 Subject: [PATCH 26/37] [IMP]add blocked reason dialog bzr revid: rlu@tinyerp.com-20140411122320-o0zmebvaz0985mrx --- addons/web/static/src/js/view_form.js | 59 ++++++++++++++++++++--- addons/web_kanban/static/src/js/kanban.js | 45 +++++++++++++++-- 2 files changed, 94 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 04e9687115f..5fbbd1e84ef 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2367,7 +2367,42 @@ instance.web.form.DropdownSelection = instance.web.form.FieldChar.extend({ this.$el.on('mouseenter mouseleave', function(e) { self.$el.find('.caret').toggleClass('hidden', e.type == 'mouseleave'); }); - + }, + on_click_block_reason: function(event) { + var self = this; + var li = $(event.target).closest( "li" ); + $('div.oe_edit_actions').remove(); + self.$dialog = new instance.web.dialog($('
                    '), { + modal: true, + width: 'auto', + height: 'auto', + title: _t('Reason for blocking'), + buttons: [ + { + class: 'oe_highlight', + text: _t("Block"), click: function() { + if ($("#txtReason").val() == "") { + alert('Reason Required'); + } else { + value[self.name] = String(li.data('value')); + var reason = $("#txtReason").val() + $(this).dialog("close"); + if (self.record_id) { + self.view.dataset._model.call('write', [[self.record_id], value, self.view.dataset.get_context()]) + return self.view.dataset._model.call('message_post', [[self.record_id], reason]).done(self.reload_record.bind(self)); + } else { + return self.view.on_button_save().done(function(result) { + if (result) { + self.view.dataset._model.call('write', [[result], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self)); + } + }); + } + }; + } + }, + { text: _t("Cancel"), click: function() { $(this).dialog("close"); }} + ], + }); }, do_action: function(e) { var self = this; @@ -2375,12 +2410,22 @@ instance.web.form.DropdownSelection = instance.web.form.FieldChar.extend({ if (li.length) { var value = {}; value[self.name] = String(li.data('value')); - if (self.record_id) { - return self.view.dataset._model.call('write', [[self.record_id], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self)); - } else { - return self.view.on_button_save().done(function(result) { - if (result) { - self.view.dataset._model.call('write', [[result], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self)); + if (self.view.datarecord.stage_id) { + var stage_id = _.isArray(self.view.datarecord.stage_id) ? self.view.datarecord.stage_id[0] : self.view.datarecord.stage_id + new openerp.web.Model(self.view.fields.stage_id.field.relation).query([]) + .filter([["id", "=", stage_id]]).first().then(function(res) { + if ((res.block_reason) && value[self.name] == 'blocked') { + self.on_click_block_reason(e); + } else { + if (self.record_id) { + return self.view.dataset._model.call('write', [[self.record_id], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self)); + } else { + return self.view.on_button_save().done(function(result) { + if (result) { + self.view.dataset._model.call('write', [[result], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self)); + } + }); + } } }); } diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 934de72c570..919e5cb17bc 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1334,15 +1334,54 @@ instance.web_kanban.DropdownSelection = instance.web_kanban.AbstractField.extend self.$el.find('.caret').toggleClass('hidden', e.type == 'mouseleave'); }); }, + + on_click_block_reason: function(event) { + var self = this; + var li = $(event.target).closest( "li" ); + $('div.oe_edit_actions').remove(); + self.$dialog = new instance.web.dialog($('
                    '), { + modal: true, + width: 'auto', + height: 'auto', + title: _t('Reason for blocking'), + buttons: [ + { + class: 'oe_highlight', + text: _t("Block"), click: function() { + if ($("#txtReason").val() == "") { + alert('Reason Required'); + } else { + value[self.name] = String(li.data('value')); + var reason = $("#txtReason").val(); + $(this).dialog("close"); + self.parent.view.dataset._model.call('write', [[self.record_id], value, self.parent.view.dataset.get_context()]).done(self.reload_record.bind(self.parent)); + return self.parent.view.dataset._model.call('message_post', [[self.record_id], reason]); + }; + }}, + { text: _t("Cancel"), click: function() { $(this).dialog("close"); }} + ], + }); +}, do_action: function(e) { var self = this; var li = $(e.target).closest( "li" ); if (li.length) { var value = {}; value[self.name] = String(li.data('value')); - return self.parent.view.dataset._model.call('write', [[self.record_id], value, self.parent.view.dataset.get_context()]).done(self.reload_record.bind(self.parent)); - } - }, + if (self.parent.group.value) { + var stage_id = self.parent.group.value + new openerp.web.Model(self.parent.record.stage_id.relation).query([]) + .filter([["id", "=", stage_id]]).first().then(function(res) { + if ((res.block_reason) && value[self.name] == 'blocked') { + self.on_click_block_reason(e); + } else { + return self.parent.view.dataset._model.call('write', [[self.record_id], value, self.parent.view.dataset.get_context()]).done(self.reload_record.bind(self.parent)); + } + }); + } + } + }, + reload_record: function() { this.do_reload(); }, From c28afcf88e81576d05bfb4a9a7650522ca4c814e Mon Sep 17 00:00:00 2001 From: Barad Mahendra Date: Fri, 11 Apr 2014 18:37:08 +0530 Subject: [PATCH 27/37] [IMP]fix typo bzr revid: mba@tinyerp.com-20140411130708-2pymt9n3qovpcmlu --- addons/web/static/src/js/view_form.js | 1 + addons/web_kanban/static/src/js/kanban.js | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 5fbbd1e84ef..c1fa3284202 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2384,6 +2384,7 @@ instance.web.form.DropdownSelection = instance.web.form.FieldChar.extend({ if ($("#txtReason").val() == "") { alert('Reason Required'); } else { + value = {} value[self.name] = String(li.data('value')); var reason = $("#txtReason").val() $(this).dialog("close"); diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 919e5cb17bc..e036a1b5fc3 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1351,6 +1351,7 @@ instance.web_kanban.DropdownSelection = instance.web_kanban.AbstractField.extend if ($("#txtReason").val() == "") { alert('Reason Required'); } else { + value = {} value[self.name] = String(li.data('value')); var reason = $("#txtReason").val(); $(this).dialog("close"); From 6b5e3eed2e8457e86ae74827eecce56029780f9d Mon Sep 17 00:00:00 2001 From: Barad Mahendra Date: Tue, 15 Apr 2014 15:18:43 +0530 Subject: [PATCH 28/37] [IMP]improve css for oe_star_left bzr revid: mba@tinyerp.com-20140415094843-73octusya5941hua --- addons/web/static/src/css/base.css | 4 ++++ addons/web/static/src/css/base.sass | 3 +++ addons/web/static/src/xml/base.xml | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 16ba4fe78ea..7fae47dc059 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3375,6 +3375,10 @@ body.oe_single_form .oe_single_form_container { background-image: -moz-radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%); background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44cc44 40%, #33bb33 100%); } +.openerp .oe_star_left { + float: left; + margin-right: 8px; +} .ui-icon { width: 18px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 92f07743869..92fb4c0c289 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2748,6 +2748,9 @@ body.oe_single_form background-image: -moz-radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%) background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44cc44 40%, #33bb33 100%) + .oe_star_left + float: left + margin-right: 8px // End hack }}} // Hack for ui icon {{{ diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index b69d9b6c249..95c2d4236ff 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1045,12 +1045,12 @@
                      -
                      • +
                      • -
                      • +
                    From 5979488e357033070d41ad49e5b7cd6aaf75c83a Mon Sep 17 00:00:00 2001 From: Barad Mahendra Date: Wed, 16 Apr 2014 15:20:23 +0530 Subject: [PATCH 29/37] [IMP]imporve dropdown_selection tamplate bzr revid: mba@tinyerp.com-20140416095023-hh0dkh837r7team5 --- addons/web/static/src/xml/base.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 95c2d4236ff..c34cf65c648 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1024,10 +1024,10 @@ - + - - Toggle Dropdown + + Toggle Dropdown