From d3fc2b3602a1626b276cfd7cd2290d532164557e Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Tue, 22 Jan 2013 16:03:58 +0530 Subject: [FIX] onchange call after m2o returns after/with changes.--fixes:lp577376 bzr revid: bth@tinyerp.com-20130122103358-csduy0gtwi58kp76 --- addons/web/static/src/js/view_form.js | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/web/static/src/js/view_form.js') diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 01d4bf6dd33..bea0bec5f80 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3034,6 +3034,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc self.display_value = {}; self.render_value(); self.focus(); + self.view.do_onchange(self); }); }); -- cgit v1.2.3 From 93a1d36d90f85312ca4bfc8ba8820c54fa5b274f Mon Sep 17 00:00:00 2001 From: Vishmita Date: Tue, 22 Jan 2013 19:09:56 +0530 Subject: [FIX]Pager doesn't disappear when we create a new record from o2m/m2m popup lp bug: https://launchpad.net/bugs/1096830 fixed bzr revid: vja@tinyerp.com-20130122133956-tv425if9oe3zqsr6 --- addons/web/static/src/js/view_form.js | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/web/static/src/js/view_form.js') diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 01d4bf6dd33..376f5209d62 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4714,6 +4714,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend if (this.view_list) { this.view_list.$el.hide(); } + this.$el.find('.oe_popup_list_pager').hide(); this.setup_form_view(); }, }); -- cgit v1.2.3 From 6c460544cc70a9781bdd4d4414ef52c9361b3c14 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Wed, 23 Jan 2013 16:28:38 +0530 Subject: [Fix]Improve code bzr revid: vja@tinyerp.com-20130123105838-kd4isg7vcxcfk0su --- addons/web/static/src/js/view_form.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'addons/web/static/src/js/view_form.js') diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 376f5209d62..3249507f4bb 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4712,9 +4712,8 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend this.searchview.hide(); } if (this.view_list) { - this.view_list.$el.hide(); + this.view_list.do_hide(); } - this.$el.find('.oe_popup_list_pager').hide(); this.setup_form_view(); }, }); -- cgit v1.2.3 From 56e4be5d1d53291862cbb3cf1b7f3d94c5a46725 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 7 Jun 2013 10:39:01 +0200 Subject: [IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos) bzr revid: chm@openerp.com-20130607083901-f24fjvo0vi696ll3 --- addons/web/static/src/js/view_form.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/js/view_form.js') diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 480bd482a2b..cd6ed39b924 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2346,7 +2346,7 @@ instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({ }, on_button_clicked: function() { if (!this.get('value') || !this.is_syntax_valid()) { - this.do_warn(_t("E-mail error"), _t("Can't send email to invalid e-mail address")); + this.do_warn(_t("E-mail Error"), _t("Can't send email to invalid e-mail address")); } else { location.href = 'mailto:' + this.get('value'); } @@ -2376,7 +2376,7 @@ instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({ }, on_button_clicked: function() { if (!this.get('value')) { - this.do_warn(_t("Resource error"), _t("This resource is empty")); + this.do_warn(_t("Resource Error"), _t("This resource is empty")); } else { var url = $.trim(this.get('value')); if(/^www\./i.test(url)) @@ -5305,7 +5305,7 @@ instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractFie // TODO : activate send on wizard and form if (result.error || !result.id ) { - this.do_warn( _t('Uploading error'), result.error); + this.do_warn( _t('Uploading Error'), result.error); files = _.filter(files, function (val) { return !val.upload; }); } else { for(var i in files){ -- cgit v1.2.3 From a941c199c19279c6a2fd947dca3d1a80b9aa35c9 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 7 Jun 2013 12:15:17 +0200 Subject: [FIX] translation button or icon not displayed with html widget. Bug 1179505 bzr revid: chm@openerp.com-20130607101517-zilu97d4akhho72v --- addons/web/static/src/js/view_form.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'addons/web/static/src/js/view_form.js') diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index cd6ed39b924..f242bf50cc9 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2721,6 +2721,11 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc self.internal_set_value(self.$textarea.val()); } }); + if (this.field.translate) { + var $img = $('') + .click(this.on_translate); + this.$cleditor.$toolbar.append($img); + } } }, render_value: function() { -- cgit v1.2.3 From 27db64f7a081baa5cc1a32248dc378a55dd8f006 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 7 Jun 2013 15:22:03 +0200 Subject: [FIX] duplicate tag when press tab key two time. Bug 1154057 bzr revid: chm@openerp.com-20130607132203-rcvx6wu820o03tiu --- addons/web/static/src/js/view_form.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/js/view_form.js') diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index f242bf50cc9..5a9c8695e53 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4108,7 +4108,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in ext: { autocomplete: { selectFromDropdown: function() { - $(this).trigger('hideDropdown'); + this.trigger('hideDropdown'); var index = Number(this.selectedSuggestionElement().children().children().data('index')); var data = self.search_result[index]; if (data.id) { @@ -4117,6 +4117,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in ignore_blur = true; data.action(); } + this.trigger('setSuggestions', {result : []}); }, }, tags: { -- cgit v1.2.3