diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2008-10-06 23:35:47 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2008-10-06 23:35:47 +0200 |
| commit | 9e6f14b8521cf00c998da4febf3eca1fffaeee65 (patch) | |
| tree | a6d465847944ebc5df1dad26804da5158320ae68 /addons/document | |
| parent | da33e07d815f4d7809efdb77105a6b3abfe6ea48 (diff) | |
| parent | 4f1fcdb3a9145d05b95074c5db31febf7b14d69a (diff) | |
better view
bzr revid: fp@tinyerp.com-20081006213547-b0sgnl0sxsxv2mf4
Diffstat (limited to 'addons/document')
| -rw-r--r-- | addons/document/document.py | 38 | ||||
| -rw-r--r-- | addons/document/document_view.xml | 4 |
2 files changed, 23 insertions, 19 deletions
diff --git a/addons/document/document.py b/addons/document/document.py index b28b81af7d9..d312b33f366 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -226,24 +226,27 @@ class document_directory(osv.osv): ('dirname_uniq', 'unique (name,parent_id,ressource_id,ressource_parent_type_id)', 'The directory name must be unique !') ] - def get_resource_path(self,cr,uid,res_model,res_id): - # to be need test + def get_resource_path(self,cr,uid,dir_id,res_model,res_id): + # this method will be used in process module + # to be need test and Improvement if resource dir has parent resource (link resource) path=[] - def _parent(dir_id): + def _parent(dir_id,path): parent=self.browse(cr,uid,dir_id) - if parent.parent_id: - _parent(parent.parent_id.id) - else: + if parent.parent_id and not parent.ressource_parent_type_id: + _parent(parent.parent_id.id,path) path.append(parent.name) - return path - model_ids=self.pool.get('ir.model').search(cr,uid,[('model','=',res_model)]) - directory_ids=self.search(cr,uid,[('ressource_type_id','=',model_ids[0]),('ressource_id','=',res_id)]) - if len(directory_ids): - path=parent(directory_ids[0]) - direc=self.browse(cr,uid,directory_ids)[0] - path.append(direc.name) - path.append(self.pool.get(direc.ressource_type_id.model).browse(cr,uid,res_id).name) - return "ftp://localhost:8021/"+cr.dbname+'/'.join(path) + else: + path.append(parent.name) + return path + + directory=self.browse(cr,uid,dir_id) + 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) + user=self.pool.get('res.users').browse(cr,uid,uid) + #print "ftp://%s:%s@localhost:8021/%s/%s"%(user.login,user.password,cr.dbname,'/'.join(path)) + return "ftp://%s:%s@localhost:8021/%s/%s"%(user.login,user.password,cr.dbname,'/'.join(path)) return False def _check_duplication(self, cr, uid,vals): if 'name' in vals: @@ -343,8 +346,9 @@ class document_directory(osv.osv): return result def write(self, cr, uid, ids, vals, context=None): - if not self._check_duplication(cr,uid,vals): - raise except_orm('ValidateError', 'Directory name must be unique!') + # need to make constraints to checking duplicate + #if not self._check_duplication(cr,uid,vals): + # raise except_orm('ValidateError', 'Directory name must be unique!') return super(document_directory,self).write(cr,uid,ids,vals,context=context) def copy(self, cr, uid, id, default=None, context=None): diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 1b44907af30..9567637605c 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -178,7 +178,7 @@ <field name="priority" eval="1"/> <field name="arch" type="xml"> <field name="subflow_id" position="after"> - <field name="directory_id"/> + <field name="directory_id" domain="[('ressource_type_id','=',model_id),('ressource_parent_type_id','=',False)]"/> <newline/> </field> </field> @@ -192,7 +192,7 @@ <field name="priority" eval="1"/> <field name="arch" type="xml"> <field name="subflow_id" position="after"> - <field name="directory_id"/> + <field name="directory_id" domain="[('ressource_type_id','=',model_id),('ressource_parent_type_id','=',False)]"/> <newline/> </field> </field> |