diff options
| author | uco (OpenERP) <uco@tinyerp.com> | 2010-11-19 19:18:01 +0530 |
|---|---|---|
| committer | uco (OpenERP) <uco@tinyerp.com> | 2010-11-19 19:18:01 +0530 |
| commit | 12fcd1be2f1a891b7fe099ad0044e68c45280907 (patch) | |
| tree | f60c92735fb1f9bde88b4affe5fa513b5e460570 /addons/document | |
| parent | 58e9ba97bbe188438cb67c1f59292f9b4d1de1c5 (diff) | |
[IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
Diffstat (limited to 'addons/document')
| -rw-r--r-- | addons/document/directory_content.py | 6 | ||||
| -rw-r--r-- | addons/document/directory_report.py | 6 | ||||
| -rw-r--r-- | addons/document/document.py | 20 | ||||
| -rw-r--r-- | addons/document/document_directory.py | 8 | ||||
| -rw-r--r-- | addons/document/document_storage.py | 8 | ||||
| -rw-r--r-- | addons/document/wizard/document_configuration.py | 4 |
6 files changed, 38 insertions, 14 deletions
diff --git a/addons/document/directory_content.py b/addons/document/directory_content.py index 685df7910f3..8c0c9e0e88b 100644 --- a/addons/document/directory_content.py +++ b/addons/document/directory_content.py @@ -44,7 +44,7 @@ class document_directory_content(osv.osv): _name = 'document.directory.content' _description = 'Directory Content' _order = "sequence" - def _extension_get(self, cr, uid, context={}): + def _extension_get(self, cr, uid, context=None): cr.execute('select code,name from document_directory_content_type where active') res = cr.fetchall() return res @@ -110,9 +110,11 @@ class document_directory_content(osv.osv): return True def process_read(self, cr, uid, node, context=None): + if not context: + context = {} if node.extension != '.pdf': raise Exception("Invalid content: %s" % node.extension) - report = self.pool.get('ir.actions.report.xml').browse(cr, uid, node.report_id) + report = self.pool.get('ir.actions.report.xml').browse(cr, uid, node.report_id, context=context) srv = netsvc.Service._services['report.'+report.report_name] ctx = node.context.context.copy() ctx.update(node.dctx) diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py index 88a95a1705b..97d70e1a3cb 100644 --- a/addons/document/directory_report.py +++ b/addons/document/directory_report.py @@ -26,8 +26,10 @@ class ir_action_report_xml(osv.osv): _name="ir.actions.report.xml" _inherit ="ir.actions.report.xml" - def _model_get(self, cr, uid, ids, name, arg, context): + def _model_get(self, cr, uid, ids, name, arg, context=None): res = {} + if not context: + context = {} model_pool = self.pool.get('ir.model') for data in self.read(cr, uid, ids, ['model']): model = data.get('model',False) @@ -39,7 +41,7 @@ class ir_action_report_xml(osv.osv): res[data.get('id')] = False return res - def _model_search(self, cr, uid, obj, name, args, context={}): + def _model_search(self, cr, uid, obj, name, args, context=None): if not len(args): return [] model_id= args[0][2] diff --git a/addons/document/document.py b/addons/document/document.py index e3d810668b4..0ccd0ec51ec 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -38,7 +38,9 @@ class document_file(osv.osv): def _get_filestore(self, cr): return os.path.join(DMS_ROOT_PATH, cr.dbname) - def _data_get(self, cr, uid, ids, name, arg, context): + def _data_get(self, cr, uid, ids, name, arg, context=None): + if not context: + context = {} fbrl = self.browse(cr, uid, ids, context=context) nctx = nodes.get_node_context(cr, uid, context={}) # nctx will /not/ inherit the caller's context. Most of @@ -59,9 +61,11 @@ class document_file(osv.osv): # # This code can be improved # - def _data_set(self, cr, uid, id, name, value, arg, context): + def _data_set(self, cr, uid, id, name, value, arg, context=None): if not value: return True + if not context: + context = {} fbro = self.browse(cr, uid, id, context=context) nctx = nodes.get_node_context(cr, uid, context={}) fnode = nodes.node_file(None, None, nctx, fbro) @@ -136,10 +140,12 @@ class document_file(osv.osv): def copy(self, cr, uid, id, default=None, context=None): if not default: default = {} + if not context: + context = {} if 'name' not in default: name = self.read(cr, uid, [id])[0]['name'] default.update({'name': name + " (copy)"}) - return super(document_file, self).copy(cr, uid, id, default, context) + return super(document_file, self).copy(cr, uid, id, default, context=context) def write(self, cr, uid, ids, vals, context=None): result = False @@ -222,11 +228,13 @@ class document_file(osv.osv): cr.commit() # ? return result - def __get_partner_id(self, cr, uid, res_model, res_id, context): + def __get_partner_id(self, cr, uid, res_model, res_id, context=None): """ A helper to retrieve the associated partner from any res_model+id It is a hack that will try to discover if the mentioned record is clearly associated with a partner record. """ + if not context: + context = {} obj_model = self.pool.get(res_model) if obj_model._name == 'res.partner': return res_id @@ -241,12 +249,14 @@ class document_file(osv.osv): def unlink(self, cr, uid, ids, context=None): stor = self.pool.get('document.storage') unres = [] + if not context: + context = {} # We have to do the unlink in 2 stages: prepare a list of actual # files to be unlinked, update the db (safer to do first, can be # rolled back) and then unlink the files. The list wouldn't exist # after we discard the objects ids = self.search(cr, uid, [('id','in',ids)]) - for f in self.browse(cr, uid, ids, context): + for f in self.browse(cr, uid, ids, context=context): # TODO: update the node cache par = f.parent_id storage_id = None 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) diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py index aa2edb6b411..eaa4244f10f 100644 --- a/addons/document/document_storage.py +++ b/addons/document/document_storage.py @@ -439,7 +439,7 @@ class document_storage(osv.osv): """ if context is None: context = {} - boo = self.browse(cr, uid, id, context) + boo = self.browse(cr, uid, id, context=context) if not boo.online: raise IOError(errno.EREMOTE, 'medium offline') @@ -542,7 +542,7 @@ class document_storage(osv.osv): """ if not context: context = {} - boo = self.browse(cr, uid, id, context) + boo = self.browse(cr, uid, id, context=context) if fil_obj: ira = fil_obj else: @@ -688,6 +688,8 @@ class document_storage(osv.osv): @return the dict of values that can safely be be stored in the db. """ + if not context: + context = {} sbro = self.browse(cr, uid, file_node.storage_id, context=context) assert sbro, "The file #%d didn't provide storage" % file_node.file_id @@ -730,6 +732,8 @@ class document_storage(osv.osv): file should move to. @return the dict of values that can safely be be stored in the db. """ + if not context: + context = {} sbro = self.browse(cr, uid, file_node.storage_id, context=context) assert sbro, "The file #%d didn't provide storage" % file_node.file_id diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py index a497eb6af90..bc25e6bdc44 100644 --- a/addons/document/wizard/document_configuration.py +++ b/addons/document/wizard/document_configuration.py @@ -33,8 +33,10 @@ class document_configuration(osv.osv_memory): def execute(self, cr, uid, ids, context=None): + if not context: + context = {} conf_id = ids and ids[0] or False - conf = self.browse(cr, uid, conf_id, context) + conf = self.browse(cr, uid, conf_id, context=context) dir_pool = self.pool.get('document.directory') data_pool = self.pool.get('ir.model.data') model_pool = self.pool.get('ir.model') |
