Xavier (Open ERP) has proposed merging
lp:~openerp-dev/openobject-server/7.0-improve-rng-xmo into
lp:openobject-server/7.0.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/7.0-improve-rng-xmo/+merge/145384
* Factorization of redundant attributes between view buttons and fields
* Removal of attributes which don't make sense on view fields (but may do on
import records)
* Enumeration of literal values for a bunch of attributes which have only a
single or a few value(s)
--
https://code.launchpad.net/~openerp-dev/openobject-server/7.0-improve-rng-xmo/+merge/145384
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/7.0-improve-rng-xmo.
=== modified file 'openerp/addons/base/rng/view.rng'
--- openerp/addons/base/rng/view.rng 2012-11-26 07:21:47 +0000
+++ openerp/addons/base/rng/view.rng 2013-01-29 14:42:23 +0000
@@ -58,6 +58,27 @@
</rng:optional>
</rng:define>
+ <!-- properties (attributes) shared between fields and buttons -->
+ <rng:define name="shared_button_field">
+ <rng:ref name="access_rights"/>
+ <rng:ref name="modifiable"/>
+ <rng:ref name="overload"/>
+
+ <rng:optional><rng:attribute name="attrs"/></rng:optional>
+ <rng:optional><rng:attribute name="invisible"/></rng:optional>
+ <rng:optional><rng:attribute name="string" /></rng:optional>
+ <rng:optional><rng:attribute name="icon" /></rng:optional>
+ <rng:optional><rng:attribute name="states" /></rng:optional>
+ <rng:optional><rng:attribute name="align" /></rng:optional>
+ <rng:optional>
+ <rng:attribute name="colspan">
+ <rng:data type="integer"/>
+ </rng:attribute>
+ </rng:optional>
+ <rng:optional><rng:attribute name="context"/></rng:optional>
+ <rng:optional><rng:attribute name="default_focus"><rng:value>1</rng:value></rng:attribute></rng:optional>
+ </rng:define>
+
<rng:define name="dashboard-column">
<rng:element name="column">
<rng:zeroOrMore>
@@ -539,24 +560,14 @@
<rng:define name="field">
<rng:element name="field">
<rng:attribute name="name" />
- <rng:ref name="overload"/>
- <rng:ref name="access_rights"/>
- <rng:ref name="modifiable"/>
+ <rng:ref name="shared_button_field"/>
<rng:optional><rng:attribute name="domain_filter"/></rng:optional>
- <rng:optional><rng:attribute name="attrs"/></rng:optional>
- <rng:optional><rng:attribute name="string"/></rng:optional>
- <rng:optional><rng:attribute name="completion"/></rng:optional>
+ <rng:optional><rng:attribute name="completion"><rng:value>1</rng:value></rng:attribute></rng:optional>
<rng:optional><rng:attribute name="width"/></rng:optional>
- <rng:optional><rng:attribute name="type"/></rng:optional>
- <rng:optional><rng:attribute name="ref"/></rng:optional>
- <rng:optional><rng:attribute name="eval"/></rng:optional>
- <rng:optional><rng:attribute name="search"/></rng:optional>
- <rng:optional><rng:attribute name="model"/></rng:optional>
- <rng:optional><rng:attribute name="use"/></rng:optional>
+ <rng:optional><rng:attribute name="type"><rng:value>xml</rng:value></rng:attribute></rng:optional>
<rng:optional><rng:attribute name="on_change"/></rng:optional>
<rng:optional><rng:attribute name="domain"/></rng:optional>
<rng:optional><rng:attribute name="filter_domain"/></rng:optional>
- <rng:optional><rng:attribute name="invisible"/></rng:optional>
<rng:optional><rng:attribute name="password"/></rng:optional>
<rng:optional><rng:attribute name="comparator"/></rng:optional>
<rng:optional><rng:attribute name="sum"/></rng:optional>
@@ -565,17 +576,13 @@
<rng:optional><rng:attribute name="select"/></rng:optional>
<rng:optional><rng:attribute name="group"/></rng:optional>
<rng:optional><rng:attribute name="operator"/></rng:optional>
- <rng:optional><rng:attribute name="colspan"/></rng:optional>
<rng:optional><rng:attribute name="nolabel"/></rng:optional>
<rng:optional><rng:attribute name="default_get"/></rng:optional>
<rng:optional><rng:attribute name="required"/></rng:optional>
<rng:optional><rng:attribute name="readonly"/></rng:optional>
<rng:optional><rng:attribute name="view_mode"/></rng:optional>
<rng:optional><rng:attribute name="widget"/></rng:optional>
- <rng:optional><rng:attribute name="context"/></rng:optional>
- <rng:optional><rng:attribute name="states"/></rng:optional>
<rng:optional><rng:attribute name="digits"/></rng:optional>
- <rng:optional><rng:attribute name="icon"/></rng:optional>
<rng:optional><rng:attribute name="mode"/></rng:optional>
<rng:optional><rng:attribute name="img_width"/></rng:optional>
<rng:optional><rng:attribute name="img_height"/></rng:optional>
@@ -583,9 +590,7 @@
<rng:optional><rng:attribute name="filename"/></rng:optional>
<rng:optional><rng:attribute name="height"/></rng:optional>
<rng:optional><rng:attribute name="rowspan"/></rng:optional>
- <rng:optional><rng:attribute name="align"/></rng:optional>
<rng:optional><rng:attribute name="selection"/></rng:optional>
- <rng:optional><rng:attribute name="default_focus"/></rng:optional>
<rng:optional><rng:attribute name="filters"/></rng:optional>
<rng:optional><rng:attribute name="statusbar_visible"/></rng:optional>
<rng:optional><rng:attribute name="statusbar_colors"/></rng:optional>
@@ -674,26 +679,23 @@
<rng:define name="button">
<rng:element name="button">
- <rng:ref name="overload"/>
- <rng:ref name="access_rights"/>
- <rng:ref name="modifiable"/>
- <rng:optional><rng:attribute name="attrs"/></rng:optional>
- <rng:optional><rng:attribute name="invisible"/></rng:optional>
+ <rng:ref name="shared_button_field"/>
<rng:optional><rng:attribute name="name" /></rng:optional>
- <rng:optional><rng:attribute name="icon" /></rng:optional>
- <rng:optional><rng:attribute name="string" /></rng:optional>
- <rng:optional><rng:attribute name="states" /></rng:optional>
- <rng:optional><rng:attribute name="type" /></rng:optional>
- <rng:optional><rng:attribute name="special" /></rng:optional>
- <rng:optional><rng:attribute name="align" /></rng:optional>
- <rng:optional><rng:attribute name="colspan"/></rng:optional>
- <rng:optional><rng:attribute name="target"/></rng:optional>
+ <rng:optional>
+ <rng:attribute name="type">
+ <rng:choice>
+ <rng:value>action</rng:value>
+ <rng:value>object</rng:value>
+ <rng:value>workflow</rng:value>
+ </rng:choice>
+ </rng:attribute>
+ </rng:optional>
+ <rng:optional><rng:attribute name="special"><rng:value>cancel</rng:value></rng:attribute></rng:optional>
+ <rng:optional><rng:attribute name="target"><rng:value>new</rng:value></rng:attribute></rng:optional>
<rng:optional><rng:attribute name="readonly"/></rng:optional>
- <rng:optional><rng:attribute name="context"/></rng:optional>
<rng:optional><rng:attribute name="confirm"/></rng:optional>
<rng:optional><rng:attribute name="help"/></rng:optional>
<rng:optional><rng:attribute name="class"/></rng:optional>
- <rng:optional><rng:attribute name="default_focus"/></rng:optional>
<rng:zeroOrMore>
<rng:choice>
<rng:ref name="form" />
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
