From d11103b2f11a134fca98e6196da65808961862a9 Mon Sep 17 00:00:00 2001 From: "Bhumika (OpenERP)" Date: Fri, 24 Jun 2011 16:21:08 +0530 Subject: [PATCH 1/5] [Fix] document_ftp: In pooler method is remvoe so i rename the method bzr revid: sbh@tinyerp.com-20110624105108-w8pbhpb1mfb0kcfk --- addons/document_ftp/ftpserver/abstracted_fs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py index 7580a8831cf..b8ce97a7017 100644 --- a/addons/document_ftp/ftpserver/abstracted_fs.py +++ b/addons/document_ftp/ftpserver/abstracted_fs.py @@ -68,7 +68,7 @@ class abstracted_fs(object): db, cr = None, None try: try: - db = pooler.get_db_only(db_name) + db = pooler.get_db(db_name) cr = db.cursor() cr.execute("SELECT 1 FROM pg_class WHERE relkind = 'r' AND relname = 'ir_module_module'") if not cr.fetchone(): From a4d1f92097aad085925457d4bbd7bb0ad5274e63 Mon Sep 17 00:00:00 2001 From: "Bhumika (OpenERP)" Date: Fri, 24 Jun 2011 16:26:10 +0530 Subject: [PATCH 2/5] [Fix] document_webdav: rename pooler method name bzr revid: sbh@tinyerp.com-20110624105610-874pt2oi9w641bmp --- addons/document_webdav/dav_fs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py index 8c606e4cca0..5e01bf6a66c 100644 --- a/addons/document_webdav/dav_fs.py +++ b/addons/document_webdav/dav_fs.py @@ -361,7 +361,7 @@ class openerp_dav_handler(dav_interface): for db_name in result: cr = None try: - db = pooler.get_db_only(db_name) + db = pooler.get_db(db_name) cr = db.cursor() cr.execute("SELECT id FROM ir_module_module WHERE name = 'document' AND state='installed' ") res=cr.fetchone() From efc308e690ea9c8227d4cea7d6bfbebbab32f789 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Tue, 28 Jun 2011 10:33:50 +0530 Subject: [PATCH 3/5] [FIX] Fix the problem of reconfirm lp bug: https://launchpad.net/bugs/802539 fixed bzr revid: dbr@tinyerp.com-20110628050350-yt7muh597au50xpr --- addons/crm/crm.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 39927705a22..489f480182e 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -236,7 +236,6 @@ class crm_base(object): """ cases = self.browse(cr, uid, ids) cases[0].state # to fill the browse record cache - self._history(cr, uid, cases, _('Draft')) self.write(cr, uid, ids, {'state': 'draft', 'active': True}) self._action(cr, uid, cases, 'draft') return True From 79a24bd46ee4b4d961afbfea78e746f754e24ed9 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 28 Jun 2011 16:09:07 +0200 Subject: [PATCH 4/5] [FIX] removal of unique() callbacks from callback chains Array.prototype.pop() does *not* take a parameter, it always removes the last item of the array. To remove items in the middle of an array, Array.prototype.splice(index, 1) has to be used. This fixes an issue where adding a unique non-last callback (either added as non-last, or with other stuff added after it) would result in nonsensical behavior bzr revid: xmo@openerp.com-20110628140907-5sch98gmwcnpvk3t --- addons/base/static/src/js/chrome.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 556c715d339..12f9bc2e7ae 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -11,8 +11,8 @@ openerp.base.callback = function(obj, method) { for(var i = 0; i < callback.callback_chain.length; i++) { var c = callback.callback_chain[i]; if(c.unique) { - // al: obscure but shortening C-style hack, sorry - callback.callback_chain.pop(i--); + callback.callback_chain.splice(i, 1); + i -= 1; } r = c.callback.apply(c.self, c.args.concat(args)); // TODO special value to stop the chain From 62ef841b15b5098ab278c7ee0c91c70d59a20be5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 28 Jun 2011 16:21:24 +0200 Subject: [PATCH 5/5] [FIX] warnings, typos, globals which should not be globals, and use jquery shortcuts when there is no reason not to bzr revid: xmo@openerp.com-20110628142124-oexuucl4dpic6x1x --- addons/base/static/src/js/chrome.js | 11 +++++------ addons/base/static/src/js/views.js | 14 +++++--------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 12f9bc2e7ae..20baae85d76 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -284,13 +284,12 @@ openerp.base.generate_null_object_class = function(claz, add) { } if (prototype.prototype) copy_proto(prototype.prototype); - } + }; copy_proto(claz.prototype); - var init = openerp.base.BasicController.prototype.init; - newer.init = init; + newer.init = openerp.base.BasicController.prototype.init; var tmpclass = claz.extend(newer); return tmpclass.extend(add || {}); -} +}; openerp.base.Notification = openerp.base.BasicController.extend({ init: function(element_id) { @@ -580,7 +579,7 @@ openerp.base.Controller = openerp.base.BasicController.extend( /** @lends opener */ controller_get: function(key) { return this.controller_registry[key]; - // OR should contrustct it ? setting parent correctly ? + // OR should build it ? setting parent correctly ? // function construct(constructor, args) { // function F() { // return constructor.apply(this, args); @@ -640,7 +639,7 @@ openerp.base.Controller = openerp.base.BasicController.extend( /** @lends opener } // TODO if post prefix //this.element_id = _.uniqueId(_.toArray(arguments).join('_')); - }; + } }, /** * Performs a JSON-RPC call diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 6d2c32dfdd9..8d6bdf9b123 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -128,7 +128,7 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ controller.set_embedded_view(view.embedded_view); } if (view_type === 'list' && this.flags.search_view === false && this.action && this.action['auto_search']) { - // In case the search view is not instanciated: manually call ListView#search + // In case the search view is not instantiated: manually call ListView#search var domains = !_(self.action.domain).isEmpty() ? [self.action.domain] : [], contexts = !_(self.action.context).isEmpty() @@ -349,16 +349,12 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({ }, do_refresh: function(new_view) { var view = this.view_manager.active_view; - the_condition = this.sections.length > 0 && _.detect(this.sections, + var the_condition = this.sections.length > 0 && _.detect(this.sections, function(x) {return x.elements.length > 0;}) != undefined && (!new_view || view != 'list'); - if (!the_condition) { - this.$element.addClass('closed-sidebar'); - this.$element.removeClass('open-sidebar'); - } else { - this.$element.addClass('open-sidebar'); - this.$element.removeClass('closed-sidebar'); - } + + this.$element.toggleClass('open-sidebar', the_condition) + .toggleClass('closed-sidebar', !the_condition); this.$element.html(QWeb.render("ViewManager.sidebar.internal", { sidebar: this, view: view }));