[FIX] removed unused fields (user_ids) on act_window
bzr revid: fp@tinyerp.com-20091224142504-i7ajdf41rasxntpg
This commit is contained in:
Fabien Pinckaers
parent
2c739db798
commit
49c1cc97f4
|
|
@ -115,8 +115,8 @@
|
|||
<field name="padding"/>
|
||||
<field name="number_increment"/>
|
||||
<field name="number_next"/>
|
||||
<field name="weight" />
|
||||
<field name="condition" colspan="4" />
|
||||
<field name="weight" />
|
||||
<field name="condition" colspan="4" />
|
||||
<separator colspan="4" string="Legend (for prefix, suffix)"/>
|
||||
<group col="8" colspan="4">
|
||||
<group>
|
||||
|
|
@ -151,11 +151,11 @@
|
|||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="company_id"/>
|
||||
<field name="number_next"/>
|
||||
<field name="number_increment"/>
|
||||
<field name="prefix"/>
|
||||
<field name="padding"/>
|
||||
<field name="active"/>
|
||||
<field name="number_next"/>
|
||||
<field name="number_increment"/>
|
||||
<field name="prefix"/>
|
||||
<field name="padding"/>
|
||||
<field name="active"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -341,36 +341,35 @@
|
|||
<field name="usage"/>
|
||||
<field name="view_type"/>
|
||||
<notebook colspan="4">
|
||||
<page string="General Settings">
|
||||
<field colspan="4" name="view_ids">
|
||||
<form string="Views">
|
||||
<field colspan="4" name="sequence"/>
|
||||
<field name="view_mode"/>
|
||||
<field domain="[('type', '=', view_mode)]" name="view_id"/>
|
||||
</form>
|
||||
<tree string="Views">
|
||||
<field name="sequence"/>
|
||||
<field name="view_mode"/>
|
||||
<field name="view_id"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field colspan="4" name="default_user_ids"/>
|
||||
<field colspan="4" name="menus"/>
|
||||
<field colspan="4" name="domain"/>
|
||||
<field colspan="4" name="context"/>
|
||||
<field name="limit"/>
|
||||
<field name="auto_refresh"/>
|
||||
<newline/>
|
||||
<field name="view_mode"/>
|
||||
<field name="filter"/>
|
||||
<field name="view_id"/>
|
||||
<field name="search_view_id"/>
|
||||
</page>
|
||||
<page string="Security">
|
||||
<separator colspan="4" string="Select Groups" />
|
||||
<field name="groups_id" nolabel="1" colspan="4" />
|
||||
</page>
|
||||
</notebook>
|
||||
<page string="General Settings">
|
||||
<field colspan="4" name="view_ids">
|
||||
<form string="Views">
|
||||
<field colspan="4" name="sequence"/>
|
||||
<field name="view_mode"/>
|
||||
<field domain="[('type', '=', view_mode)]" name="view_id"/>
|
||||
</form>
|
||||
<tree string="Views">
|
||||
<field name="sequence"/>
|
||||
<field name="view_mode"/>
|
||||
<field name="view_id"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field colspan="4" name="menus"/>
|
||||
<field colspan="4" name="domain"/>
|
||||
<field colspan="4" name="context"/>
|
||||
<field name="limit"/>
|
||||
<field name="auto_refresh"/>
|
||||
<newline/>
|
||||
<field name="view_mode"/>
|
||||
<field name="filter"/>
|
||||
<field name="view_id"/>
|
||||
<field name="search_view_id"/>
|
||||
</page>
|
||||
<page string="Security">
|
||||
<separator colspan="4" string="Select Groups" />
|
||||
<field name="groups_id" nolabel="1" colspan="4" />
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -1229,13 +1228,13 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Server Action">
|
||||
<group col="6" colspan="4">
|
||||
<field name="name" select="1"/>
|
||||
<field name="model_id" select="1"/>
|
||||
<field name="state" select="1"/>
|
||||
<field name="sequence" select="2"/>
|
||||
<field name="condition"/>
|
||||
</group>
|
||||
<group col="6" colspan="4">
|
||||
<field name="name" select="1"/>
|
||||
<field name="model_id" select="1"/>
|
||||
<field name="state" select="1"/>
|
||||
<field name="sequence" select="2"/>
|
||||
<field name="condition"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Python Code" attrs="{'invisible':[('state','!=','code')]}">
|
||||
<separator colspan="4" string="Python Code"/>
|
||||
|
|
@ -1248,7 +1247,7 @@
|
|||
<field name="trigger_name" select="2" attrs="{'required':[('state','=','trigger')]}"/>
|
||||
</page>
|
||||
<page string="Action to Launch" attrs="{'invisible':[('state','!=','client_action')]}">
|
||||
<separator colspan="4" string="Client Action Configuration"/>
|
||||
<separator colspan="4" string="Client Action Configuration"/>
|
||||
<field name="action_id" select="2" attrs="{'required':[('state','=','client_action')]}"/>
|
||||
</page>
|
||||
<page string="Email Configuration" attrs="{'invisible':[('state','!=','email')]}">
|
||||
|
|
@ -1268,7 +1267,7 @@
|
|||
</page>
|
||||
<page string="Create / Write" attrs="{'invisible':[('state','!=','object_create'),('state','!=','object_write')]}">
|
||||
<separator colspan="4" string="Fields Mapping"/>
|
||||
<field name="srcmodel_id" select="2" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'),('state','!=','trigger'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
|
||||
<field name="srcmodel_id" select="2" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'),('state','!=','trigger'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
|
||||
<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)]"/>
|
||||
|
|
|
|||
|
|
@ -159,16 +159,6 @@ class act_window(osv.osv):
|
|||
(_check_model, 'Invalid model name in the action definition.', ['res_model','src_model'])
|
||||
]
|
||||
|
||||
def get_filters(self, cr, uid, model):
|
||||
cr.execute('select id from ir_act_window a where a.id not in (select act_id from ir_act_window_user_rel) and a.res_model=\''+model+'\' and a.filter=\'1\';')
|
||||
all_ids = cr.fetchall()
|
||||
filter_ids = map(lambda x:x[0],all_ids)
|
||||
act_ids = self.search(cr,uid,[('res_model','=',model),('filter','=',1),('default_user_ids','in',(','.join(map(str,[uid,])),))])
|
||||
act_ids += filter_ids
|
||||
act_ids = list(set(act_ids))
|
||||
my_acts = self.read(cr, uid, act_ids, ['name', 'domain'])
|
||||
return my_acts
|
||||
|
||||
def _views_get_fnc(self, cr, uid, ids, name, arg, context={}):
|
||||
res={}
|
||||
for act in self.browse(cr, uid, ids):
|
||||
|
|
@ -246,7 +236,6 @@ class act_window(osv.osv):
|
|||
'act_id', 'gid', 'Groups'),
|
||||
'search_view_id': fields.many2one('ir.ui.view', 'Search View Ref.'),
|
||||
'filter': fields.boolean('Filter'),
|
||||
'default_user_ids': fields.many2many('res.users', 'ir_act_window_user_rel', 'act_id', 'uid', 'Users'),
|
||||
'search_view' : fields.function(_search_view, type='text', method=True, string='Search View'),
|
||||
'menus': fields.char('Menus', size=4096)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue