From 48f50f9944f72128119d48bea12670899919bcee Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Fri, 20 Jul 2012 18:50:03 +0530 Subject: [PATCH 01/27] Adding a rng for label in digram view bzr revid: dhr@tinyerp.com-20120720132003-kq0ikv9b6ewkasxx --- openerp/addons/base/rng/view.rng | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index c583040495b..8f7b2647237 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -184,6 +184,9 @@ + + + From bf7e2b0e762601f5aa2c54323158585649c3d7ac Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Fri, 20 Jul 2012 18:54:14 +0530 Subject: [PATCH 02/27] Modifying diagram view to set label in diagram header bzr revid: dhr@tinyerp.com-20120720132414-pdftmig39m3ro93b --- addons/web_diagram/static/src/js/diagram.js | 13 +++++++++++++ addons/web_diagram/static/src/xml/base_diagram.xml | 1 + 2 files changed, 14 insertions(+) diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index f06e757f7f1..e7e85eea96a 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -51,6 +51,9 @@ instance.web.DiagramView = instance.web.View.extend({ var action = $(this).data('pager-action'); self.on_pager_action(action); }); + this.labels = _.filter(this.fields_view.arch.children, function(label){ + return label.tag == "label" ; + }); this.do_update_pager(); @@ -104,11 +107,21 @@ instance.web.DiagramView = instance.web.View.extend({ ); }, + get_label : function(){ + var self = this + var html_label = _.each(self.labels,function(label){ + html_label = "" + label.attrs.string + "" + self.$element.find('.oe_diagram_diagram_header').append(html_label) + }) + + }, + on_diagram_loaded: function(record) { var id_record = record['id']; if(id_record) { this.id = id_record; this.get_diagram_info(); + this.get_label(); } }, diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml index 96e32f59648..40a98a59413 100644 --- a/addons/web_diagram/static/src/xml/base_diagram.xml +++ b/addons/web_diagram/static/src/xml/base_diagram.xml @@ -14,6 +14,7 @@
+
From f78dfd6c26830ce066894a8644ec07b661bc8206 Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Mon, 23 Jul 2012 13:11:11 +0530 Subject: [PATCH 03/27] [IMP]changing span to p and applying css bzr revid: dhr@tinyerp.com-20120723074111-43n05o11ixpb5kkk --- addons/web_diagram/static/src/js/diagram.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index e7e85eea96a..ad3e5e68411 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -110,8 +110,9 @@ instance.web.DiagramView = instance.web.View.extend({ get_label : function(){ var self = this var html_label = _.each(self.labels,function(label){ - html_label = "" + label.attrs.string + "" + html_label = "

" + label.attrs.string + "

" self.$element.find('.oe_diagram_diagram_header').append(html_label) + self.$element.find('.oe_diagram_diagram_header > p').css('padding-left','5px') }) }, From 629d1041661e72361d0f34cc9477e37ae66536c0 Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Mon, 30 Jul 2012 17:59:44 +0530 Subject: [PATCH 04/27] [IMP]improving code to add label only once on load bzr revid: dhr@tinyerp.com-20120730122944-tlgjzovqbulbff1x --- addons/web_diagram/static/src/js/diagram.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index ad3e5e68411..b3c2a7dcee1 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -109,12 +109,13 @@ instance.web.DiagramView = instance.web.View.extend({ get_label : function(){ var self = this - var html_label = _.each(self.labels,function(label){ - html_label = "

" + label.attrs.string + "

" - self.$element.find('.oe_diagram_diagram_header').append(html_label) - self.$element.find('.oe_diagram_diagram_header > p').css('padding-left','5px') - }) - + if(self.$element.find('.oe_diagram_diagram_header').text() == ""){ + _.each(self.labels,function(label){ + html_label = "

" + label.attrs.string + "

" + self.$element.find('.oe_diagram_diagram_header').append(html_label) + self.$element.find('.oe_diagram_diagram_header > p').css('padding-left','5px') + }) + } }, on_diagram_loaded: function(record) { From 23c2f1fd40c4bbe9e9c9fc21c323e0cee327ffa1 Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Mon, 30 Jul 2012 18:50:49 +0530 Subject: [PATCH 05/27] [IMP] bzr revid: dhr@tinyerp.com-20120730132049-539qb9l5c4g50864 --- addons/web_diagram/static/src/js/diagram.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index b3c2a7dcee1..54f02f3cd44 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -109,13 +109,12 @@ instance.web.DiagramView = instance.web.View.extend({ get_label : function(){ var self = this - if(self.$element.find('.oe_diagram_diagram_header').text() == ""){ - _.each(self.labels,function(label){ - html_label = "

" + label.attrs.string + "

" - self.$element.find('.oe_diagram_diagram_header').append(html_label) + this.$element.find('.oe_diagram_diagram_header > p').remove(); + _.each(self.labels,function(label){ + html_label = "

" + label.attrs.string + "

" + self.$element.find('.oe_diagram_diagram_header').append(html_label) self.$element.find('.oe_diagram_diagram_header > p').css('padding-left','5px') - }) - } + }) }, on_diagram_loaded: function(record) { From 246b47602002424c6ec45ed854251e99846d75b9 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Mon, 13 Aug 2012 14:45:19 +0530 Subject: [PATCH 06/27] Workflow editor label. bzr revid: tta@openerp.com-20120813091519-lcxiemc2wojfx2d6 --- openerp/addons/base/ir/workflow/workflow_view.xml | 3 ++- openerp/addons/base/rng/view.rng | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml index c20eeaed085..084d66f720f 100644 --- a/openerp/addons/base/ir/workflow/workflow_view.xml +++ b/openerp/addons/base/ir/workflow/workflow_view.xml @@ -41,7 +41,7 @@ workflow diagram - + @@ -55,6 +55,7 @@ + diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index 8f7b2647237..0d6527e5972 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -181,12 +181,12 @@ - + - - - - + + + + From d26ed839975e46cd59349c49f33a67fc483abdc4 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 16 Aug 2012 14:00:13 +0200 Subject: [PATCH 07/27] add config for signup bzr revid: al@openerp.com-20120816120013-b3a1sjiqxvvajbs8 --- addons/base_setup/res_config.py | 2 ++ addons/base_setup/res_config_view.xml | 24 +++++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index 059a674e5f1..a14b42c97bf 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -32,6 +32,8 @@ class base_config_settings(osv.osv_memory): help="""The portal will give access to a series of documents for your customers; his quotations, his invoices, his projects, etc."""), 'module_share': fields.boolean('allow documents sharing', help="""As an example, you will be able to share a project or some tasks to your customers, or quotes/sales to several persons at your customer company, or your agenda availabilities to your contacts."""), + 'module_auth_signup': fields.boolean('allow new users to sign up'), + 'module_auth_oauth': fields.boolean('external oauth authentfication (google, facebook, ...)'), } def open_company(self, cr, uid, ids, context=None): diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index fe0fc7d1254..fd1bd104a3c 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -27,6 +27,16 @@
+ + + + From 761204d6b61be23b0e69d810f7d70e740f558613 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 16 Aug 2012 14:24:21 +0200 Subject: [PATCH 08/27] add config for auth bzr revid: al@openerp.com-20120816122421-tt79y5bdfdg1fth8 --- addons/auth_signup/res_config.xml | 15 +++++---------- addons/base_setup/res_config_view.xml | 5 +++-- addons/mail/res_config_view.xml | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml index 3bea8dc2aed..43b0c09ea1d 100644 --- a/addons/auth_signup/res_config.xml +++ b/addons/auth_signup/res_config.xml @@ -7,16 +7,11 @@ base.config.settings - - - + +
+
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index fd1bd104a3c..5e49f6d4c5f 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -27,9 +27,9 @@ - +