From 12fcd1be2f1a891b7fe099ad0044e68c45280907 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Fri, 19 Nov 2010 19:18:01 +0530 Subject: [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None. bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2 --- addons/document/document_directory.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'addons/document/document_directory.py') diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index 9412527db22..a8a54955b74 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -143,7 +143,7 @@ class document_directory(osv.osv): _parent(dir_id, path) return path - def _check_recursion(self, cr, uid, ids): + def _check_recursion(self, cr, uid, ids, context=None): level = 100 while len(ids): cr.execute('select distinct parent_id from document_directory where id in ('+','.join(map(str,ids))+')') @@ -186,6 +186,8 @@ class document_directory(osv.osv): This function can be overriden by inherited classes ;) @param dbro The browse object, if caller already has it """ + if not context: + context = {} if dbro is None: dbro = self.browse(cr, uid, ids, context=context) @@ -235,9 +237,11 @@ class document_directory(osv.osv): def copy(self, cr, uid, id, default=None, context=None): if not default: default ={} + if not context: + context = {} name = self.read(cr, uid, [id])[0]['name'] default.update({'name': name+ " (copy)"}) - return super(document_directory,self).copy(cr, uid, id, default, context) + return super(document_directory,self).copy(cr, uid, id, default, context=context) def _check_duplication(self, cr, uid, vals, ids=[], op='create'): name=vals.get('name',False) -- cgit v1.2.3 From 6dd290e8245f4ea91ce87b0f3b5f29bafeaf12e9 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Tue, 23 Nov 2010 12:35:05 +0530 Subject: [REF]: Replace the condition 'if not context' with 'if context is None'. bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn --- addons/document/document_directory.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'addons/document/document_directory.py') diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index a8a54955b74..1f7d1e15807 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -175,8 +175,6 @@ class document_directory(osv.osv): """ Return a node object for the given uri. This fn merely passes the call to node_context """ - if not context: - context = {} return nodes.get_node_context(cr, uid, context).get_uri(cr, uri) @@ -186,8 +184,6 @@ class document_directory(osv.osv): This function can be overriden by inherited classes ;) @param dbro The browse object, if caller already has it """ - if not context: - context = {} if dbro is None: dbro = self.browse(cr, uid, ids, context=context) @@ -237,8 +233,6 @@ class document_directory(osv.osv): def copy(self, cr, uid, id, default=None, context=None): if not default: default ={} - if not context: - context = {} name = self.read(cr, uid, [id])[0]['name'] default.update({'name': name+ " (copy)"}) return super(document_directory,self).copy(cr, uid, id, default, context=context) -- cgit v1.2.3 From d827b2f6ea63dc04b91a7e59b3e7fecd7c5810d3 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Mon, 13 Dec 2010 12:13:09 +0530 Subject: [REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods. bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb --- addons/document/document_directory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/document/document_directory.py') diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index 1f7d1e15807..2a3f54f53ba 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -196,7 +196,7 @@ class document_directory(osv.osv): else: raise ValueError("dir node for %s type", dbro.type) - def _prepare_context(self, cr, uid, nctx, context): + def _prepare_context(self, cr, uid, nctx, context=None): """ Fill nctx with properties for this database @param nctx instance of nodes.node_context, to be filled @param context ORM context (dict) for us @@ -210,7 +210,7 @@ class document_directory(osv.osv): """ return - def get_dir_permissions(self, cr, uid, ids, context=None ): + def get_dir_permissions(self, cr, uid, ids, context=None): """Check what permission user 'uid' has on directory 'id' """ assert len(ids) == 1 -- cgit v1.2.3