* Update process module (document integration).
bzr revid: ame@tinyerp.com-20080930110801-rr7cowd5femqpp1j
This commit is contained in:
parent
306a8c8285
commit
62fe10a237
|
@ -117,10 +117,6 @@ class process_process(osv.osv):
|
|||
data['gray'] = False
|
||||
data['url'] = node.help_url
|
||||
|
||||
# chech whether directory_id from inherited from document2 is available
|
||||
if 'directory_id' in node and node.directory_id:
|
||||
data['directory'] = "ftp://localhost:8021" #TODO: implement document_directory.get_url
|
||||
|
||||
# get assosiated workflow
|
||||
if data['model']:
|
||||
wkf_ids = self.pool.get('workflow').search(cr, uid, [('osv', '=', data['model'])])
|
||||
|
@ -194,6 +190,10 @@ 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 whether directory_id from inherited from document module
|
||||
if 'directory_id' in refobj and refobj.directory_id:
|
||||
res['directory'] = self.pool.get('document.directory').get_resource_path(cr, uid, node.directory_id.id, ref_model, ref_id)
|
||||
|
||||
resource['name'] = refobj.name_get(context)[0][1]
|
||||
resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context)[0]
|
||||
|
||||
|
@ -208,9 +208,7 @@ class process_process(osv.osv):
|
|||
rel = refobj[n]
|
||||
if rel and isinstance(rel, list) :
|
||||
rel = rel[0]
|
||||
if isinstance(rel, basestring):
|
||||
print "XXX: ", rel
|
||||
try: # XXXXXXXXXXXXXXXXXXX
|
||||
try: # XXX: rel has been reported as string (check it)
|
||||
_id = (rel or False) and rel.id
|
||||
_model = node['model']
|
||||
update_relatives(r, _id, _model)
|
||||
|
|
Loading…
Reference in New Issue