Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-wiki-and-related-modules-bde
into lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-wiki-and-related-modules-bde/+merge/110059
Hello Sir,
I have added sheet tag in wiki module.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-wiki-and-related-modules-bde/+merge/110059
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-wiki-and-related-modules-bde
into lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp.
=== modified file 'wiki/wiki_view.xml'
--- wiki/wiki_view.xml 2012-05-07 18:13:46 +0000
+++ wiki/wiki_view.xml 2012-06-13 12:30:43 +0000
@@ -30,37 +30,40 @@
<field name="model">wiki.groups</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Wiki Groups">
- <group col="4" colspan="3" >
- <field name="name" select="1"/>
- <field name="create_date" readonly="2"/>
- </group>
- <group col="2" colspan="1">
- <field name="method" select="1"/>
- <field name="home" select="1" domain="[('group_id','=',active_id)]"
- attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
- </group>
- <notebook colspan="4">
- <page string="Notes">
- <separator string="Group Description" colspan="4"/>
- <field name="notes" colspan="4" nolabel="1"/>
- </page><page string="Configuration">
- <separator string="Page Template" colspan="4"/>
- <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
- </page>
- </notebook>
- <field name="menu_id"/>
- <button
- name="%(wiki.action_wiki_create_menu)d"
- string="Create Menu"
- type="action"
- icon="gtk-justify-fill"
- attrs="{'invisible':[('menu_id','!=',False)]}"/>
- <button
- name="open_wiki_page"
- string="Open Wiki Page"
- type="object"
- icon="gtk-ok" />
+ <form string="Wiki Groups" version="7.0">
+ <sheet layout="auto">
+ <group col="4" colspan="3" >
+ ield name="name" select="1"/>
+ <field name="create_date" readonly="2"/>
+ </group>
+ <group col="2" colspan="1">
+ <field name="method" select="1"/>
+ <field name="home" select="1" domain="[('group_id','=',active_id)]"
+ attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
+ </group>
+ <notebook colspan="4">
+ <page string="Notes">
+ <separator string="Group Description" colspan="4"/>
+ <field name="notes" colspan="4" nolabel="1"/>
+ </page>
+ <page string="Configuration">
+ <separator string="Page Template" colspan="4"/>
+ <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
+ </page>
+ </notebook>
+ <field name="menu_id"/>
+ <button
+ name="%(wiki.action_wiki_create_menu)d"
+ string="Create Menu"
+ type="action"
+ icon="gtk-justify-fill"
+ attrs="{'invisible':[('menu_id','!=',False)]}"/>
+ <button
+ name="open_wiki_page"
+ string="Open Wiki Page"
+ type="object"
+ icon="gtk-ok" />
+ </sheet>
</form>
</field>
</record>
@@ -126,30 +129,32 @@
<field name="model">wiki.wiki</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Wiki">
- <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)"/>
- <field name="parent_id" domain="[('group_id','=',group_id)]"/>
- <field name="section"/>
- </group>
- <notebook colspan="4">
- <page string="Content">
- <separator colspan="4" string="Page Content"/>
- <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
- </page>
- </notebook>
- <group col="2" colspan="2" groups="base.group_no_one">
- <separator colspan="4" string="Modification Information"/>
- <field name="write_date" readonly="1"/>
- <field name="minor_edit"/>
- <field name="review" select="1"/>
- </group>
- <group col="2" colspan="2">
- <separator colspan="4" string="Meta Information"/>
- <field name="tags" select="1"/>
- <field name="toc" groups="base.group_no_one"/>
- </group>
+ <form string="Wiki" version="7.0">
+ <sheet layout="auto">
+ <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)"/>
+ <field name="parent_id" domain="[('group_id','=',group_id)]"/>
+ <field name="section"/>
+ </group>
+ <notebook colspan="4">
+ <page string="Content">
+ <separator colspan="4" string="Page Content"/>
+ <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
+ </page>
+ </notebook>
+ <group col="2" colspan="2" groups="base.group_no_one">
+ <separator colspan="4" string="Modification Information"/>
+ <field name="write_date" readonly="1"/>
+ <field name="minor_edit"/>
+ <field name="review" select="1"/>
+ </group>
+ <group col="2" colspan="2">
+ <separator colspan="4" string="Meta Information"/>
+ <field name="tags" select="1"/>
+ <field name="toc" groups="base.group_no_one"/>
+ </group>
+ </sheet>
</form>
</field>
</record>
@@ -227,12 +232,14 @@
<field name="model">wiki.wiki.history</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Wiki History">
- <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"/>
+ <form string="Wiki History" version="7.0">
+ <sheet layout="auto">
+ <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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
