[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-wiki-and-related-modules-bde

bzr revid: atp@tinyerp.com-20120614051536-y88ed435epsli9sc
This commit is contained in:
Atul Patel (OpenERP) 2012-06-14 10:45:36 +05:30
commit e73b656874
1 changed files with 44 additions and 39 deletions

View File

@ -30,7 +30,7 @@
<field name="model">wiki.groups</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Wiki Groups">
<form string="Wiki Groups" version="7.0">
<group col="4" colspan="3" >
<field name="name" select="1"/>
<field name="create_date" readonly="2"/>
@ -44,7 +44,8 @@
<page string="Notes">
<separator string="Group Description" colspan="4"/>
<field name="notes" colspan="4" nolabel="1"/>
</page><page string="Configuration">
</page>
<page string="Configuration">
<separator string="Page Template" colspan="4"/>
<field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
</page>
@ -126,7 +127,8 @@
<field name="model">wiki.wiki</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Wiki">
<form string="Wiki" version="7.0">
<sheet>
<group col="6" colspan="4">
<field name="name" select="1" colspan="6"/>
<field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
@ -150,6 +152,7 @@
<field name="tags" select="1"/>
<field name="toc" groups="base.group_no_one"/>
</group>
</sheet>
</form>
</field>
</record>
@ -227,12 +230,14 @@
<field name="model">wiki.wiki.history</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Wiki History">
<form string="Wiki History" version="7.0">
<sheet>
<field name="wiki_id" select="1" colspan="4"/>
<field name="summary" select="1" colspan="4"/>
<field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/>
<field name="create_date" select="1" readonly="1"/>
<field name="minor_edit" select="1" groups="base.group_no_one"/>
</sheet>
</form>
</field>
</record>