From cab1e94006e5b054b45d52eafa1d76a9a4858b4f Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Wed, 30 Jan 2013 12:59:00 +0530 Subject: [PATCH 1/8] [Fix] Fixed the issue of bounce effect in statusbar bzr revid: ggh@tinyerp.com-20130130072900-wvucseuo7fflaupq --- 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 4880b3882ff..f7d27d666fc 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -212,7 +212,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } }); //bounce effect on red button when click on statusbar. - this.$el.find(".oe_form_field_status:not(.oe_form_status_clickable)").on('click', function (e) { + this.$el.on('click', '.oe_form_field_status:not(.oe_form_status_clickable)', function (e) { if((self.get("actual_mode") == "view")) { var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','clear':'none'}); $button.openerpBounce(); From dac59ced4805bdebe5cf844f0416920cc7703922 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Thu, 31 Jan 2013 11:08:27 +0530 Subject: [PATCH 2/8] [IMP] bounce effect on highlight button using statusbar bzr revid: ggh@tinyerp.com-20130131053827-219jr1awgh4tr685 --- addons/web/static/src/css/base.css | 4 ++++ addons/web/static/src/css/base.sass | 3 +++ addons/web/static/src/js/view_form.js | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 6cfee50d6a4..123742d5b0b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -190,6 +190,10 @@ .openerp .oe_bounce_container { display: inline-block; } +.openerp .oe_bounce_highlight_btn { + margin: auto; + display: inline-block; +} .openerp .text-tag .text-button { height: auto !important; min-height: 16px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b4665808caf..223a476d238 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -248,6 +248,9 @@ $sheet-padding: 16px .oe_bounce_container display: inline-block + .oe_bounce_highlight_btn + margin: auto + display: inline-block // Bug lp:1051746 .text-tag .text-button height: auto !important diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index f7d27d666fc..b19eab03b75 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -212,9 +212,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } }); //bounce effect on red button when click on statusbar. + self.$el.find(".oe_highlight").wrap('
'); this.$el.on('click', '.oe_form_field_status:not(.oe_form_status_clickable)', function (e) { if((self.get("actual_mode") == "view")) { - var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','clear':'none'}); + var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)"); $button.openerpBounce(); e.stopPropagation(); } From 081f3ee483bc3d32b2ab676e89b2eb06a6ec265c Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Thu, 31 Jan 2013 14:33:17 +0530 Subject: [PATCH 3/8] Improve code for bounce effect in statusbar bzr revid: ggh@tinyerp.com-20130131090317-h9ce44qob4zohbdj --- addons/web/static/src/css/base.css | 4 ---- addons/web/static/src/css/base.sass | 3 --- addons/web/static/src/js/view_form.js | 3 +-- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 123742d5b0b..6cfee50d6a4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -190,10 +190,6 @@ .openerp .oe_bounce_container { display: inline-block; } -.openerp .oe_bounce_highlight_btn { - margin: auto; - display: inline-block; -} .openerp .text-tag .text-button { height: auto !important; min-height: 16px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 223a476d238..b4665808caf 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -248,9 +248,6 @@ $sheet-padding: 16px .oe_bounce_container display: inline-block - .oe_bounce_highlight_btn - margin: auto - display: inline-block // Bug lp:1051746 .text-tag .text-button height: auto !important diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b19eab03b75..6889e2bba64 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -212,10 +212,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } }); //bounce effect on red button when click on statusbar. - self.$el.find(".oe_highlight").wrap('
'); this.$el.on('click', '.oe_form_field_status:not(.oe_form_status_clickable)', function (e) { if((self.get("actual_mode") == "view")) { - var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)"); + var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','margin-left':'0px','white-space':'nowrap'}); $button.openerpBounce(); e.stopPropagation(); } From 3e51a7eaac80fc33d644cfc3d033368cf49d6b73 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Mon, 4 Feb 2013 14:45:34 +0530 Subject: [PATCH 4/8] [IMP] Improved bounce effect on popup form view bzr revid: ggh@tinyerp.com-20130204091534-idayo7ag2b4g4vtp --- 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 6889e2bba64..a6feae1bc20 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -213,7 +213,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }); //bounce effect on red button when click on statusbar. this.$el.on('click', '.oe_form_field_status:not(.oe_form_status_clickable)', function (e) { - if((self.get("actual_mode") == "view")) { + if((self.get("actual_mode") == "view") || (self.get("actual_mode") == "edit")) { var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','margin-left':'0px','white-space':'nowrap'}); $button.openerpBounce(); e.stopPropagation(); From 58be5244a79dd9d8d8f78dda5646277fa6768592 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Mon, 11 Mar 2013 17:16:18 +0530 Subject: [PATCH 5/8] [IMP] Improved code bzr revid: ggh@tinyerp.com-20130311114618-uyggyahrz6fgjwxo --- 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 a6feae1bc20..4bf77f2f8e7 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -214,7 +214,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM //bounce effect on red button when click on statusbar. this.$el.on('click', '.oe_form_field_status:not(.oe_form_status_clickable)', function (e) { if((self.get("actual_mode") == "view") || (self.get("actual_mode") == "edit")) { - var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','margin-left':'0px','white-space':'nowrap'}); + var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','margin-left':'2px','position':'relative','left':'2px','white-space':'nowrap'}); $button.openerpBounce(); e.stopPropagation(); } From 4e5fb96772804cac9341bc79337301ca3d8bda5b Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Tue, 12 Mar 2013 11:30:20 +0530 Subject: [PATCH 6/8] [IMP] Improved code bzr revid: ggh@tinyerp.com-20130312060020-lpz1dlwahx1nf7dh --- 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 97858e3442c..6109cab9421 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -214,7 +214,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM //bounce effect on red button when click on statusbar. this.$el.on('click', '.oe_form_field_status:not(.oe_form_status_clickable)', function (e) { if((self.get("actual_mode") == "view") || (self.get("actual_mode") == "edit")) { - var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','margin-left':'2px','position':'relative','left':'2px','white-space':'nowrap'}); + var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','margin-left':'2px','margin-right':'3px','position':'relative','left':'2px','white-space':'nowrap'}); $button.openerpBounce(); e.stopPropagation(); } From 0e18097084546df3fcf9dfbacbcfd977914d2210 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Tue, 12 Mar 2013 12:52:42 +0530 Subject: [PATCH 7/8] [IMP] Improved code bzr revid: ggh@tinyerp.com-20130312072242-61xix526zcilho22 --- 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 6109cab9421..fb48a9b62b9 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -214,7 +214,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM //bounce effect on red button when click on statusbar. this.$el.on('click', '.oe_form_field_status:not(.oe_form_status_clickable)', function (e) { if((self.get("actual_mode") == "view") || (self.get("actual_mode") == "edit")) { - var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','margin-left':'2px','margin-right':'3px','position':'relative','left':'2px','white-space':'nowrap'}); + var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','margin-left':'3px','margin-right':'2px','white-space':'nowrap'}); $button.openerpBounce(); e.stopPropagation(); } From 04d28929d06892d1f0037bc75ec2f7a52c499420 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Tue, 19 Mar 2013 14:28:04 +0530 Subject: [PATCH 8/8] [FIX] Fixed abstract form popup open editable mode bzr revid: ggh@tinyerp.com-20130319085804-ghxdei3yf6lxqq8o --- addons/web/static/src/js/view_form.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0522b7d9fd7..e628528d2c8 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -213,7 +213,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }); //bounce effect on red button when click on statusbar. this.$el.on('click', '.oe_form_field_status:not(.oe_form_status_clickable)', function (e) { - if((self.get("actual_mode") == "view") || (self.get("actual_mode") == "edit")) { + if(self.get("actual_mode") == "view") { var $button = self.$el.find(".oe_highlight:not(.oe_form_invisible)").css({'float':'left','margin-left':'3px','margin-right':'2px','white-space':'nowrap'}); $button.openerpBounce(); e.stopPropagation(); @@ -4596,13 +4596,13 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ this.dataset.index = null; } var options = _.clone(self.options.form_view_options) || {}; - if (this.row_id !== null) { - options.initial_mode = this.options.readonly ? "view" : "edit"; - } _.extend(options, { $buttons: this.$buttonpane, }); this.view_form = new instance.web.FormView(this, this.dataset, this.options.view_id || false, options); + if (this.row_id !== null) { + options.initial_mode = this.options.readonly ? "view" : this.view_form.options.initial_mode; + } if (this.options.alternative_form_view) { this.view_form.set_embedded_view(this.options.alternative_form_view); }