[IMP] process view node now links to parent document directory if no record selected.

bzr revid: ame@tinyerp.com-20090825133222-gieka35fk5o3rmfc
This commit is contained in:
ame (Tiny/Axelor)
2009-08-25 19:02:22 +05:30
parent 804178a2fe
commit e8865e6509
2 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -302,7 +302,8 @@ class document_directory(osv.osv):
model_ids=self.pool.get('ir.model').search(cr,uid,[('model','=',res_model)])
if directory:
_parent(dir_id,path)
path.append(self.pool.get(directory.ressource_type_id.model).browse(cr,uid,res_id).name)
if res_id:
path.append(self.pool.get(directory.ressource_type_id.model).browse(cr,uid,res_id).name)
user=self.pool.get('res.users').browse(cr,uid,uid)
return "ftp://%s:%s@localhost:%s/%s/%s"%(user.login,user.password,config.get('ftp_server_port',8021),cr.dbname,'/'.join(path))
return False
+2 -1
View File
@@ -132,6 +132,7 @@ class process_process(osv.osv):
if 'directory_id' in node and node.directory_id:
data['directory_id'] = node.directory_id.id
data['directory'] = self.pool.get('document.directory').get_resource_path(cr, uid, data['directory_id'], data['model'], False)
if node.menu_id:
data['menu'] = {'name': node.menu_id.complete_name, 'id': node.menu_id.id}
@@ -200,7 +201,7 @@ class process_process(osv.osv):
refobj = pool.get(ref_model).browse(cr, uid, [ref_id], context)[0]
fields = pool.get(ref_model).fields_get(cr, uid, context=context)
# chech for directory_id from inherited from document module
# check for directory_id from inherited from document module
if nodes[nid].get('directory_id', False):
resource['directory'] = self.pool.get('document.directory').get_resource_path(cr, uid, nodes[nid]['directory_id'], ref_model, ref_id)