From defc239d9537cef4099dcf0a6af0474a3d5358e8 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 26 Jun 2012 16:58:01 +0530 Subject: [PATCH 01/10] [IMP] remove the title "Change my Preferences" And rearrenge fields in preferences bzr revid: fka@tinyerp.com-20120626112801-zw3n8auufwky5a3x --- openerp/addons/base/res/res_users_view.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 82093dadd4b..44e7e77c476 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -202,15 +202,15 @@

() -

+ + + + - Change My Preferences ir.actions.act_window res.users form From a4995d990278432308668325cf6d250257bc1167 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Wed, 27 Jun 2012 17:23:20 +0530 Subject: [PATCH 02/10] [IMP] Add name in window bzr revid: kjo@tinyerp.com-20120627115320-ip48sm1g564g6vir --- openerp/addons/base/res/res_users_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 44e7e77c476..edc680a1f22 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -222,6 +222,7 @@ + Change My Preferences ir.actions.act_window res.users form From a7df6d69e06bd9af556529b4d506197ecf14a860 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Wed, 27 Jun 2012 17:45:39 +0530 Subject: [PATCH 03/10] [IMP] remove the header tag in company field bzr revid: kjo@tinyerp.com-20120627121539-h46t0kev48tg4fql --- openerp/addons/base/res/res_users_view.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index edc680a1f22..fcb7a5b1a56 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -206,11 +206,8 @@ - From 482b1ce9c6915a860e98d245a00f595c8bf3d340 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Wed, 27 Jun 2012 18:46:27 +0530 Subject: [PATCH 04/10] [IMP] set class oe_inline to name bzr revid: kjo@tinyerp.com-20120627131627-1qki2cpf7unxu2ht --- openerp/addons/base/res/res_users_view.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index fcb7a5b1a56..38d7526d6aa 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -198,12 +198,10 @@
-
-

- - () -

-
+

+ + () +

Date: Wed, 4 Jul 2012 14:48:06 +0530 Subject: [PATCH 05/10] [IMP]res_user: remove group string bzr revid: kjo@tinyerp.com-20120704091806-0ie4yp41hvkcn23b --- openerp/addons/base/res/res_users_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 38d7526d6aa..7997e476b02 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -202,7 +202,7 @@ () - + From 0aa8726201cbc014b06ccaf9d6c536f893167f58 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 17 Jul 2012 17:55:39 +0200 Subject: [PATCH 06/10] [FIX] web_dashboard: allow columns without actions bzr revid: chs@openerp.com-20120717155539-dludvgbvhzfpsx83 --- addons/web_dashboard/static/src/js/dashboard.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 0754bfd7e2b..a19151af33c 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -37,11 +37,12 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ delete(action.attrs.width); delete(action.attrs.height); delete(action.attrs.colspan); - self.rpc('/web/action/load', { - action_id: parseInt(action.attrs.name, 10) - }, function(result) { - self.on_load_action(result, column_index + '_' + action_index, action.attrs); - }); + var action_id = _.str.toNumber(action.attrs.name); + if (!_.isNaN(action_id)) { + self.rpc('/web/action/load', {action_id: action_id}, function(result) { + self.on_load_action(result, column_index + '_' + action_index, action.attrs); + }); + } }); }); }, From c1d7f61d1fef37609179edee3d5e0374c9f25ca7 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 17 Jul 2012 17:56:11 +0200 Subject: [PATCH 07/10] [FIX] web_dashboard: generate a valid view bzr revid: chs@openerp.com-20120717155611-ns8w0u1u0niq1q30 --- addons/web_dashboard/static/src/xml/web_dashboard.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml index 5ca2551255c..68dda7d7f67 100644 --- a/addons/web_dashboard/static/src/xml/web_dashboard.xml +++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml @@ -48,7 +48,7 @@ -
+ From aad9ce6416a96c8368def382c4ec96aec77a53aa Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 18 Jul 2012 12:17:29 +0200 Subject: [PATCH 08/10] [IMP] added possibility to only highlight the first line in read only m2o bzr revid: nicolas.vanhoren@openerp.com-20120718101729-k1rxexdzozy5cx5i --- addons/web/static/src/js/view_form.js | 15 +++++++++++++-- addons/web/static/src/xml/base.xml | 5 ++++- 2 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 3f389d3d41f..2e404a6bfdd 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2739,10 +2739,20 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc this.$input.val(str.split("\n")[0]); this.current_display = this.$input.val(); } else { - str = _.escape(str).split("\n").join("
"); + var lines = _.escape(str).split("\n"); + var link = ""; + var follow = ""; + if (! this.get_definition_options().highlight_first_line) { + link = lines.join("
"); + } else { + link = lines[0]; + follow = _.rest(lines).join("
"); + if (follow) + link += "
"; + } this.$element.find('a') .unbind('click') - .html(str) + .html(link) .click(function () { self.do_action({ type: 'ir.actions.act_window', @@ -2754,6 +2764,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc }); return false; }); + $(".oe_form_m2o_follow").html(follow); } }, set_value: function(value_) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 70b0cd85cc5..3389e016486 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -943,7 +943,10 @@ - + + + +