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

merge the 'remove group_name' from mga 

bzr revid: christophe@tinyerp.com-20080820194746-hjuvbthogelvb9vy
This commit is contained in:
Christophe Simonis 2008-08-20 21:47:46 +02:00
parent c9ae160680 8c8bab48a6
commit a3e764fba5
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/addons/base/base.sql
View File

@ -43,8 +43,7 @@ CREATE TABLE ir_model_fields (
state varchar(64) default 'base',
view_load boolean,
relate boolean default False,
primary key(id),
group_name varchar(128)
primary key(id)
);

1
bin/addons/base/ir/ir_model.py
View File

@ -121,7 +121,6 @@ class ir_model_fields(osv.osv):
'groups': fields.many2many('res.groups', 'ir_model_fields_group_rel', 'field_id', 'group_id', 'Groups'),
'view_load': fields.boolean('View Auto-Load'),
'group_name': fields.char('Group Name', size=128),
}
_defaults = {
'relate': lambda *a: 0,

13
bin/osv/orm.py
View File

@ -324,7 +324,7 @@ class orm_template(object):
'ttype': f._type,
'relate': (f.relate and 1) or 0,
'relation': f._obj or 'NULL',
'group_name': f.group_name or '',
#'group_name': f.group_name or '',
'view_load': (f.view_load and 1) or 0,
'select_level': str(f.select or 0)
}
@ -334,12 +334,12 @@ class orm_template(object):
vals['id'] = id
cr.execute("""INSERT INTO ir_model_fields (
id, model_id, model, name, field_description, ttype,
relate,relation,group_name,view_load,state,select_level
relate,relation,view_load,state,select_level
) VALUES (
%d,%s,%s,%s,%s,%s, %s,%s,%s,%s,%s, %s
%d,%s,%s,%s,%s,%s,%s,%s,%s,%s, %s
)""", (
id, vals['model_id'], vals['model'], vals['name'], vals['field_description'], vals['ttype'],
bool(vals['relate']), vals['relation'], vals['group_name'], bool(vals['view_load']), 'base',
bool(vals['relate']), vals['relation'], bool(vals['view_load']), 'base',
vals['select_level']
))
if 'module' in context:
@ -349,16 +349,15 @@ class orm_template(object):
else:
for key, val in vals.items():
if cols[k][key] != vals[key]:
#print 'Different', cols[k][key], vals[key], k, key, self._name
cr.execute('update ir_model_fields set field_description=%s where model=%s and name=%s', (vals['field_description'], vals['model'], vals['name']))
cr.commit()
cr.execute("""UPDATE ir_model_fields SET
model_id=%s, field_description=%s, ttype=%s, relate=%s, relation=%s,
group_name=%s, view_load=%s, select_level=%s
view_load=%s, select_level=%s
WHERE
model=%s AND name=%s""", (
vals['model_id'], vals['field_description'], vals['ttype'], bool(vals['relate']),
vals['relation'], vals['group_name'], bool(vals['view_load']),
vals['relation'], bool(vals['view_load']),
vals['select_level'], vals['model'], vals['name']
))
continue