odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

improvement in the server action 

bzr revid: mga@tinyerp.com-20081211150147-5j2bnp04h3g640bq
This commit is contained in:
Mantavya Gajjar 2008-12-11 20:31:47 +05:30
parent 4cdb307f12
commit 5ee1dff04c
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/addons/base/ir/ir.xml
View File

@ -1177,8 +1177,7 @@
<page string="Create / Write" attrs="{'invisible':[('state','!=','object_create'),('state','!=','object_write')]}">
<separator colspan="4" string="Fields Mapping"/>
<field name="otype" attrs="{'invisible':[('state','=','object_create')]}"/>
<field name="srcmodel_id" select="2" attrs="{'invisible':[('otype','=','copy')]}"/>
<field name="srcmodel_id" select="2"/>
<field name="fields_lines" nolabel="1" select="2" colspan="4">
<tree string="Field Mappings" editable="top">
<field name="col1" domain="[('model_id','=',parent.srcmodel_id or parent.model_id)]"/>
@ -1191,6 +1190,7 @@
<field name="value" colspan="4"/>
</form>
</field>
<field name="record_id" attrs="{'invisible':[('state','!=','object_create')]}" domain="[('model_id','in',[model_id])]"/>
<label colspan="4" string="If you use a formula type, use a python expression using the variable 'object'." align="0.0"/>
</page>

27
bin/addons/base/ir/ir_actions.py
View File

@ -396,10 +396,7 @@ class actions_server(osv.osv):
'type': fields.char('Report Type', size=32, required=True),
'srcmodel_id': fields.many2one('ir.model', 'Model'),
'fields_lines': fields.one2many('ir.server.object.lines', 'server_id', 'Fields Mapping'),
'otype': fields.selection([
('copy','Create in Same Model'),
('new','Create in Other Model')
], 'Create Model', size=32, change_default=True),
'record_id':fields.many2one('ir.model.fields', 'Record Id')
}
_defaults = {
'state': lambda *a: 'dummy',
@ -414,7 +411,6 @@ class actions_server(osv.osv):
# - ids
# If you plan to return an action, assign: action = {...}
""",
'otype': lambda *a: 'copy',
}
@ -558,9 +554,15 @@ class actions_server(osv.osv):
else:
expr = exp.value
res[exp.col1.name] = expr
obj_pool = self.pool.get(action.model_id.model)
obj_pool.write(cr, uid, [context.get('active_id')], res)
if not action.srcmodel_id:
obj_pool = self.pool.get(action.model_id.model)
obj_pool.write(cr, uid, [context.get('active_id')], res)
else:
obj_pool = self.pool.get(action.srcmodel_id.model)
id = self.pool.get(action.model_id.model).read(cr, uid, [context.get('active_id')], [action.record_id.name])
obj_pool.write(cr, uid, [int(id[0][action.record_id.name])], res)
if action.state == 'object_create':
res = {}
for exp in action.fields_lines:
@ -574,13 +576,10 @@ class actions_server(osv.osv):
res[exp.col1.name] = expr
obj_pool = None
if action.state == 'object_create' and action.otype == 'new':
obj_pool = self.pool.get(action.srcmodel_id.model)
obj_pool.create(cr, uid, res)
else:
obj_pool = self.pool.get(action.model_id.model)
id = context.get('active_id')
obj_pool.copy(cr, uid, id, res)
res_id = False
obj_pool = self.pool.get(action.srcmodel_id.model)
res_id = obj_pool.create(cr, uid, res)
self.pool.get(action.model_id.model).write(cr, uid, [context.get('active_id')], {action.record_id.name:res_id})
return False
actions_server()