Merge lp:~unifield-team/unifield-server/uf_1296_action_empty_ids into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 3408
Proposed branch: lp:~unifield-team/unifield-server/uf_1296_action_empty_ids
Merge into: lp:unifield-server
Diff against target: 40 lines (+6/-0)
3 files modified
bin/addons/base/ir/ir_actions.py (+2/-0)
bin/import_xml.rng (+1/-0)
bin/tools/convert.py (+3/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/uf_1296_action_empty_ids
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+119850@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/base/ir/ir_actions.py'
2--- bin/addons/base/ir/ir_actions.py 2011-01-04 10:13:35 +0000
3+++ bin/addons/base/ir/ir_actions.py 2012-08-16 07:15:32 +0000
4@@ -274,9 +274,11 @@
5 'display_menu_tip':fields.function(_get_help_status, type='boolean', method=True, string='Display Menu Tips',
6 help='It gives the status if the tip has to be displayed or not when a user executes an action'),
7 'multi': fields.boolean('Action on Multiple Doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view"),
8+ 'empty_ids': fields.boolean('For action: is selection of records needed ?'),
9 }
10
11 _defaults = {
12+ 'empty_ids': lambda *a: False,
13 'type': lambda *a: 'ir.actions.act_window',
14 'view_type': lambda *a: 'form',
15 'view_mode': lambda *a: 'tree,form',
16
17=== modified file 'bin/import_xml.rng'
18--- bin/import_xml.rng 2010-11-27 03:03:04 +0000
19+++ bin/import_xml.rng 2012-08-16 07:15:32 +0000
20@@ -205,6 +205,7 @@
21 <rng:optional> <rng:attribute name="groups"/> </rng:optional>
22 <rng:optional> <rng:attribute name="limit"/> </rng:optional>
23 <rng:optional> <rng:attribute name="usage"/> </rng:optional>
24+ <rng:optional> <rng:attribute name="empty_ids"/> </rng:optional>
25 <rng:optional> <rng:attribute name="auto_refresh"/> </rng:optional>
26 <rng:empty />
27 </rng:element>
28
29=== modified file 'bin/tools/convert.py'
30--- bin/tools/convert.py 2012-02-29 11:11:25 +0000
31+++ bin/tools/convert.py 2012-08-16 07:15:32 +0000
32@@ -506,6 +506,9 @@
33 res['target'] = rec.get('target','')
34 if rec.get('multi'):
35 res['multi'] = rec.get('multi', False)
36+ if rec.get('empty_ids'):
37+ res['empty_ids'] = rec.get('empty_ids', False)
38+
39 id = self.pool.get('ir.model.data')._update(cr, self.uid, 'ir.actions.act_window', self.module, res, xml_id, noupdate=self.isnoupdate(data_node), mode=self.mode)
40 self.idref[xml_id] = int(id)
41

Subscribers

People subscribed via source and target branches

to all changes: