pre-commit update

This commit is contained in:
OCA-git-bot 2020-03-14 12:02:31 +01:00 committed by Justine Doutreloux
parent aa85b8d40c
commit 6dc405c524
10 changed files with 295 additions and 237 deletions

View File

@ -1,15 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo noupdate="1"> <odoo noupdate="1">
<record id="base.user_demo" model="res.users">
<record id="base.user_demo" model="res.users"> <field eval="[(4, ref('knowledge.group_document_user'))]" name="groups_id" />
<field eval="[(4, ref('knowledge.group_document_user'))]" </record>
name="groups_id"/> <record id="demo_category1" model="document.page">
</record> <field name="name">Odoo Features</field>
<field name="type">category</field>
<record id="demo_category1" model="document.page"> <field name="template">
<field name="name">Odoo Features</field>
<field name="type">category</field>
<field name="template">
Summary of the feature Summary of the feature
Long explanation Long explanation
@ -19,12 +16,11 @@ Conclusion
Additional ressources Additional ressources
</field> </field>
</record> </record>
<record id="demo_page1" model="document.page">
<record id="demo_page1" model="document.page"> <field name="name">Odoo 13.0 Functional Demo</field>
<field name="name">Odoo 13.0 Functional Demo</field> <field name="parent_id" ref="demo_category1" />
<field name="parent_id" ref="demo_category1"/> <field name="content">
<field name="content">
<![CDATA[ <![CDATA[
<br> <br>
<br> <br>
@ -48,12 +44,11 @@ company, with your clients and implement it now for your business.<br>
<br> <br>
]]> ]]>
</field> </field>
</record> </record>
<record id="demo_page2" model="document.page">
<record id="demo_page2" model="document.page"> <field name="name">Personalise Dashboards</field>
<field name="name">Personalise Dashboards</field> <field name="parent_id" ref="demo_category1" />
<field name="parent_id" ref="demo_category1"/> <field name="content">
<field name="content">
<![CDATA[ <![CDATA[
<br> <br>
You like Odoo, but feel like you want to personalise it more? You can customize your You like Odoo, but feel like you want to personalise it more? You can customize your
@ -88,12 +83,11 @@ you change your mind there is a reset button to return to the default view.<br>
<br> <br>
]]> ]]>
</field> </field>
</record> </record>
<record id="demo_page3" model="document.page">
<record id="demo_page3" model="document.page"> <field name="name">Touchscreen Point of Sale</field>
<field name="name">Touchscreen Point of Sale</field> <field name="parent_id" ref="demo_category1" />
<field name="parent_id" ref="demo_category1"/> <field name="content">
<field name="content">
<![CDATA[ <![CDATA[
<br> <br>
The Odoo touchscreen point of sale available with 13.0 allows you<br> The Odoo touchscreen point of sale available with 13.0 allows you<br>
@ -125,6 +119,5 @@ Think of it as an out-of-the-box solution to boost your business' productivity.<
<br> <br>
]]> ]]>
</field> </field>
</record> </record>
</odoo> </odoo>

View File

@ -1,31 +1,30 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<record id="group_document_editor" model="res.groups"> <record id="group_document_editor" model="res.groups">
<field name="name">Editor</field> <field name="name">Editor</field>
<field name="category_id" ref="knowledge.module_category_knowledge"/> <field name="category_id" ref="knowledge.module_category_knowledge" />
<field name="implied_ids" eval="[(4, ref('knowledge.group_document_user'))]"/> <field name="implied_ids" eval="[(4, ref('knowledge.group_document_user'))]" />
</record> </record>
<record id="group_document_manager" model="res.groups"> <record id="group_document_manager" model="res.groups">
<field name="name">Manager</field> <field name="name">Manager</field>
<field name="category_id" ref="knowledge.module_category_knowledge"/> <field name="category_id" ref="knowledge.module_category_knowledge" />
<field name="implied_ids" eval="[(4, ref('group_document_editor'))]"/> <field name="implied_ids" eval="[(4, ref('group_document_editor'))]" />
<field name="users" eval="[(4, ref('base.user_admin'))]"/> <field name="users" eval="[(4, ref('base.user_admin'))]" />
</record> </record>
<record model="ir.rule" id="document_page_rule"> <record model="ir.rule" id="document_page_rule">
<field name="name">document_page multi-company</field> <field name="name">document_page multi-company</field>
<field name="model_id" ref="model_document_page"/> <field name="model_id" ref="model_document_page" />
<field name="global" eval="True"/> <field name="global" eval="True" />
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> <field
name="domain_force"
>['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record> </record>
<record model="ir.rule" id="document_page_history_rule"> <record model="ir.rule" id="document_page_history_rule">
<field name="name">document_page_history multi-company</field> <field name="name">document_page_history multi-company</field>
<field name="model_id" ref="model_document_page_history"/> <field name="model_id" ref="model_document_page_history" />
<field name="global" eval="True"/> <field name="global" eval="True" />
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> <field
name="domain_force"
>['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record> </record>
</odoo> </odoo>

View File

@ -3,26 +3,26 @@ table.diff {
border: medium; border: medium;
.diff_header { .diff_header {
background-color: #e0e0e0 background-color: #e0e0e0;
} }
td.diff_header { td.diff_header {
text-align: right text-align: right;
} }
.diff_next { .diff_next {
background-color:#c0c0c0 background-color: #c0c0c0;
} }
.diff_add { .diff_add {
background-color:#aaffaa background-color: #aaffaa;
} }
.diff_chg { .diff_chg {
background-color:#ffff77 background-color: #ffff77;
} }
.diff_sub { .diff_sub {
background-color:#ffaaaa background-color: #ffaaaa;
} }
} }

View File

@ -1,6 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0" ?>
<odoo> <odoo>
<!-- wiki tree view --> <!-- wiki tree view -->
<record id="view_wiki_tree_children" model="ir.ui.view"> <record id="view_wiki_tree_children" model="ir.ui.view">
<field name="name">document.page.tree</field> <field name="name">document.page.tree</field>
@ -9,29 +8,27 @@
<field name="priority">100</field> <field name="priority">100</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Document Page"> <tree string="Document Page">
<field name="name"/> <field name="name" />
<field name="content_uid"/> <field name="content_uid" />
<field name="content_date"/> <field name="content_date" />
</tree> </tree>
</field> </field>
</record> </record>
<!-- wiki list view --> <!-- wiki list view -->
<record id="view_wiki_tree" model="ir.ui.view"> <record id="view_wiki_tree" model="ir.ui.view">
<field name="name">document.page.list</field> <field name="name">document.page.list</field>
<field name="model">document.page</field> <field name="model">document.page</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Document Page"> <tree string="Document Page">
<field name="name"/> <field name="name" />
<field name="parent_id"/> <field name="parent_id" />
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company" />
<field name="create_uid" invisible="1"/> <field name="create_uid" invisible="1" />
<field name="content_uid"/> <field name="content_uid" />
<field name="content_date"/> <field name="content_date" />
</tree> </tree>
</field> </field>
</record> </record>
<!-- wiki Form view --> <!-- wiki Form view -->
<record id="view_wiki_form" model="ir.ui.view"> <record id="view_wiki_form" model="ir.ui.view">
<field name="name">document.page.form</field> <field name="name">document.page.form</field>
@ -39,90 +36,132 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Document Page"> <form string="Document Page">
<sheet> <sheet>
<widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/> <widget
<field name="active" invisible="1"/> name="web_ribbon"
<field name="type" invisible="1"/> text="Archived"
bg_color="bg-danger"
attrs="{'invisible': [('active', '=', True)]}"
/>
<field name="active" invisible="1" />
<field name="type" invisible="1" />
<h1> <h1>
<field name="name" placeholder="Name"/> <field name="name" placeholder="Name" />
</h1> </h1>
<group> <group>
<div> <div>
<field name="content" widget="html" placeholder="e.g. Once upon a time..." required="1" options="{'safe': True}"/> <field
name="content"
widget="html"
placeholder="e.g. Once upon a time..."
required="1"
options="{'safe': True}"
/>
</div> </div>
</group> </group>
<notebook> <notebook>
<page name="info" string="Information"> <page name="info" string="Information">
<group> <group>
<group> <group>
<field name="parent_id" string="Category" context="{'default_type':'category'}"/> <field
<field name="company_id" groups="base.group_multi_company"/> name="parent_id"
<field name="content_uid"/> string="Category"
<field name="content_date"/> context="{'default_type':'category'}"
<field name="menu_id" readonly="1" attrs="{'invisible': [('menu_id','=',False)]}"/> />
<field
name="company_id"
groups="base.group_multi_company"
/>
<field name="content_uid" />
<field name="content_date" />
<field
name="menu_id"
readonly="1"
attrs="{'invisible': [('menu_id','=',False)]}"
/>
</group> </group>
<group string="Revision"> <group string="Revision">
<field name="draft_name" placeholder="Rev 01" /> <field name="draft_name" placeholder="Rev 01" />
<field name="draft_summary" placeholder="eg: Changed ... for ..." /> <field
name="draft_summary"
placeholder="eg: Changed ... for ..."
/>
</group> </group>
</group> </group>
</page> </page>
<page name="history" string="History"> <page name="history" string="History">
<field name="history_ids"> <field name="history_ids">
<tree> <tree>
<field name="id"/> <field name="id" />
<field name="create_date"/> <field name="create_date" />
<field name="name"/> <field name="name" />
<field name="summary"/> <field name="summary" />
<field name="create_uid"/> <field name="create_uid" />
</tree> </tree>
</field> </field>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers" />
<field name="activity_ids" widget="mail_activity"/> <field name="activity_ids" widget="mail_activity" />
<field name="message_ids" widget="mail_thread"/> <field name="message_ids" widget="mail_thread" />
</div> </div>
</form> </form>
</field> </field>
</record> </record>
<record id="view_wiki_menu_form" model="ir.ui.view"> <record id="view_wiki_menu_form" model="ir.ui.view">
<field name="name">document.page.menu.form</field> <field name="name">document.page.menu.form</field>
<field name="model">document.page</field> <field name="model">document.page</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Document Page" create="0"> <form string="Document Page" create="0">
<field name="type" invisible="1"/> <field name="type" invisible="1" />
<h1> <h1>
<field name="name" placeholder="Name"/> <field name="name" placeholder="Name" />
</h1> </h1>
<field name="content" widget="html" class="oe_view_only" required="1" options='{"safe": True}'/> <field
name="content"
widget="html"
class="oe_view_only"
required="1"
options='{"safe": True}'
/>
</form> </form>
</field> </field>
</record> </record>
<!-- page Search view --> <!-- page Search view -->
<record id="view_wiki_filter" model="ir.ui.view"> <record id="view_wiki_filter" model="ir.ui.view">
<field name="name">document.page.search</field> <field name="name">document.page.search</field>
<field name="model">document.page</field> <field name="model">document.page</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Document Page"> <search string="Document Page">
<field name="name" string="Content" <field
filter_domain="['|', ('name','ilike',self), ('content','ilike',self)]"/> name="name"
<field name="parent_id"/> string="Content"
<field name="create_uid"/> filter_domain="['|', ('name','ilike',self), ('content','ilike',self)]"
<field name="content_uid"/> />
<field name="parent_id" />
<field name="create_uid" />
<field name="content_uid" />
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter name="group_by_category" string="Category" context="{'group_by':'parent_id'}"/> <filter
<filter name="group_by_author" string="Author" context="{'group_by':'create_uid'}"/> name="group_by_category"
<filter name="group_by_last_contributor" string="Last Contributor" context="{'group_by':'content_uid'}"/> string="Category"
context="{'group_by':'parent_id'}"
/>
<filter
name="group_by_author"
string="Author"
context="{'group_by':'create_uid'}"
/>
<filter
name="group_by_last_contributor"
string="Last Contributor"
context="{'group_by':'content_uid'}"
/>
</group> </group>
</search> </search>
</field> </field>
</record> </record>
<!-- page action --> <!-- page action -->
<record id="action_page" model="ir.actions.act_window"> <record id="action_page" model="ir.actions.act_window">
<field name="name">Pages</field> <field name="name">Pages</field>
@ -130,40 +169,37 @@
<field name="domain">[('type','=','content')]</field> <field name="domain">[('type','=','content')]</field>
<field name="context">{'default_type': 'content'}</field> <field name="context">{'default_type': 'content'}</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" ref="view_wiki_tree"/> <field name="view_id" ref="view_wiki_tree" />
<field name="search_view_id" ref="view_wiki_filter"/> <field name="search_view_id" ref="view_wiki_filter" />
<field name="help" type="html"> <field name="help" type="html">
<p class="oe_view_nocontent_create"> <p class="oe_view_nocontent_create">
Click to create a new web page. Click to create a new web page.
</p> </p>
</field> </field>
</record> </record>
<record id="action_page_view_tree" model="ir.actions.act_window.view"> <record id="action_page_view_tree" model="ir.actions.act_window.view">
<field name="sequence" eval="0"/> <field name="sequence" eval="0" />
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="view_wiki_tree"/> <field name="view_id" ref="view_wiki_tree" />
<field name="act_window_id" ref="action_page"/> <field name="act_window_id" ref="action_page" />
</record> </record>
<record id="action_page_view_form" model="ir.actions.act_window.view"> <record id="action_page_view_form" model="ir.actions.act_window.view">
<field name="sequence" eval="5"/> <field name="sequence" eval="5" />
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="view_wiki_form"/> <field name="view_id" ref="view_wiki_form" />
<field name="act_window_id" ref="action_page"/> <field name="act_window_id" ref="action_page" />
</record> </record>
<menuitem
id="menu_wiki"
<menuitem id="menu_wiki" name="Pages"
name="Pages" parent="knowledge.menu_document_root"
parent="knowledge.menu_document_root" sequence="10"
sequence="10"/> />
<menuitem
id="menu_page"
<menuitem id="menu_page" name="Pages"
name="Pages" parent="menu_wiki"
parent="menu_wiki" action="action_page"
action="action_page" sequence="20"
sequence="20"/> />
</odoo> </odoo>

View File

@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<template
<template id="assets_backend" name="document_page assets" inherit_id="web.assets_backend"> id="assets_backend"
name="document_page assets"
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<link rel="stylesheet" type="text/scss" href="/document_page/static/src/scss/document_page.scss"/> <link
rel="stylesheet"
type="text/scss"
href="/document_page/static/src/scss/document_page.scss"
/>
</xpath> </xpath>
</template> </template>
</odoo> </odoo>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<!-- Category Views --> <!-- Category Views -->
<record id="view_category_form" model="ir.ui.view"> <record id="view_category_form" model="ir.ui.view">
<field name="name">document.page.category.form</field> <field name="name">document.page.category.form</field>
@ -8,68 +7,94 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Category"> <form string="Category">
<sheet> <sheet>
<field name="type" invisible="1"/> <field name="type" invisible="1" />
<h1><field name="name" placeholder="Name"/></h1> <h1>
<field name="name" placeholder="Name" />
</h1>
<group> <group>
<group> <group>
<field name="parent_id" string="Category" context="{'default_type':'category'}"/> <field
name="parent_id"
string="Category"
context="{'default_type':'category'}"
/>
</group> </group>
<group> <group>
<field name="write_uid" groups="base.group_no_one"/> <field name="write_uid" groups="base.group_no_one" />
<field name="write_date" groups="base.group_no_one"/> <field name="write_date" groups="base.group_no_one" />
<field name="menu_id" groups="base.group_no_one"/> <field name="menu_id" groups="base.group_no_one" />
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="Template" name="template"> <page string="Template" name="template">
<field name="template" placeholder="e.g. Once upon a time..." /> <field
name="template"
placeholder="e.g. Once upon a time..."
/>
</page> </page>
<page string="Documents" name="documents"> <page string="Documents" name="documents">
<field name="content" widget="html" class="oe_view_only" options='{"safe": True}' /> <field
name="content"
widget="html"
class="oe_view_only"
options='{"safe": True}'
/>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers" />
<field name="message_ids" widget="mail_thread"/> <field name="message_ids" widget="mail_thread" />
</div> </div>
</form> </form>
</field> </field>
</record> </record>
<record id="view_category_tree" model="ir.ui.view"> <record id="view_category_tree" model="ir.ui.view">
<field name="name">document.page.category.tree</field> <field name="name">document.page.category.tree</field>
<field name="model">document.page</field> <field name="model">document.page</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Categories"> <tree string="Categories">
<field name="name"/> <field name="name" />
<field name="parent_id"/> <field name="parent_id" />
<field name="create_uid" invisible="1"/> <field name="create_uid" invisible="1" />
<field name="write_uid"/> <field name="write_uid" />
<field name="write_date"/> <field name="write_date" />
</tree> </tree>
</field> </field>
</record> </record>
<record id="view_document_category_filter" model="ir.ui.view"> <record id="view_document_category_filter" model="ir.ui.view">
<field name="name">document.page.category.search</field> <field name="name">document.page.category.search</field>
<field name="model">document.page</field> <field name="model">document.page</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Document Category"> <search string="Document Category">
<field name="name" string="Content" <field
filter_domain="['|', ('name','ilike',self), ('template','ilike',self)]"/> name="name"
<field name="parent_id"/> string="Content"
<field name="create_uid"/> filter_domain="['|', ('name','ilike',self), ('template','ilike',self)]"
<field name="content_uid"/> />
<field name="parent_id" />
<field name="create_uid" />
<field name="content_uid" />
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter name="group_by_category" string="Category" context="{'group_by':'parent_id'}"/> <filter
<filter name="group_by_author" string="Author" context="{'group_by':'create_uid'}"/> name="group_by_category"
<filter name="group_by_last_contributor" string="Last Contributor" context="{'group_by':'content_uid'}"/> string="Category"
context="{'group_by':'parent_id'}"
/>
<filter
name="group_by_author"
string="Author"
context="{'group_by':'create_uid'}"
/>
<filter
name="group_by_last_contributor"
string="Last Contributor"
context="{'group_by':'content_uid'}"
/>
</group> </group>
</search> </search>
</field> </field>
</record> </record>
<!-- Category Action --> <!-- Category Action -->
<record id="action_category" model="ir.actions.act_window"> <record id="action_category" model="ir.actions.act_window">
<field name="name">Category</field> <field name="name">Category</field>
@ -77,29 +102,26 @@
<field name="domain">[('type','=','category')]</field> <field name="domain">[('type','=','category')]</field>
<field name="context">{'default_type': 'category'}</field> <field name="context">{'default_type': 'category'}</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" ref="view_category_tree"/> <field name="view_id" ref="view_category_tree" />
<field name="search_view_id" ref="view_document_category_filter"/> <field name="search_view_id" ref="view_document_category_filter" />
</record> </record>
<record id="action_category_view_tree" model="ir.actions.act_window.view"> <record id="action_category_view_tree" model="ir.actions.act_window.view">
<field name="sequence" eval="0" /> <field name="sequence" eval="0" />
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
<field name="view_id" ref="view_category_tree"/> <field name="view_id" ref="view_category_tree" />
<field name="act_window_id" ref="action_category"/> <field name="act_window_id" ref="action_category" />
</record> </record>
<record id="action_category_view_form" model="ir.actions.act_window.view"> <record id="action_category_view_form" model="ir.actions.act_window.view">
<field name="sequence" eval="5" /> <field name="sequence" eval="5" />
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="view_category_form"/> <field name="view_id" ref="view_category_form" />
<field name="act_window_id" ref="action_category"/> <field name="act_window_id" ref="action_category" />
</record> </record>
<menuitem
<menuitem id="menu_category" id="menu_category"
parent="menu_wiki" parent="menu_wiki"
name="Categories" name="Categories"
action="action_category" action="action_category"
sequence="20"/> sequence="20"
/>
</odoo> </odoo>

View File

@ -1,38 +1,39 @@
<?xml version="1.0"?> <?xml version="1.0" ?>
<odoo> <odoo>
<!-- History Tree view --> <!-- History Tree view -->
<record model="ir.ui.view" id="view_wiki_history_tree"> <record model="ir.ui.view" id="view_wiki_history_tree">
<field name="name">document.page.history.tree</field> <field name="name">document.page.history.tree</field>
<field name="model">document.page.history</field> <field name="model">document.page.history</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Document History"> <tree string="Document History">
<field name="id"/> <field name="id" />
<field name="page_id"/> <field name="page_id" />
<field name="name"/> <field name="name" />
<field name="summary"/> <field name="summary" />
<field name="create_uid"/> <field name="create_uid" />
<field name="create_date"/> <field name="create_date" />
</tree> </tree>
</field> </field>
</record> </record>
<!-- History Search view --> <!-- History Search view -->
<record id="view_wiki_history_filter" model="ir.ui.view"> <record id="view_wiki_history_filter" model="ir.ui.view">
<field name="name">document.page.history.search</field> <field name="name">document.page.history.search</field>
<field name="model">document.page.history</field> <field name="model">document.page.history</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Document Page History"> <search string="Document Page History">
<field name="page_id"/> <field name="page_id" />
<field name="content"/> <field name="content" />
<field name="create_uid"/> <field name="create_uid" />
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter name="group_by_author" string="Author" context="{'group_by':'create_uid'}" /> <filter
name="group_by_author"
string="Author"
context="{'group_by':'create_uid'}"
/>
</group> </group>
</search> </search>
</field> </field>
</record> </record>
<!-- History Form view --> <!-- History Form view -->
<record model="ir.ui.view" id="wiki_history_form"> <record model="ir.ui.view" id="wiki_history_form">
<field name="name">document.page.history.form</field> <field name="name">document.page.history.form</field>
@ -40,50 +41,60 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Document Page History"> <form string="Document Page History">
<sheet> <sheet>
<h1><field name="page_id" readonly="1"/></h1> <h1>
<field name="page_id" readonly="1" />
</h1>
<group> <group>
<group> <group>
<field name="create_uid" readonly="1"/> <field name="create_uid" readonly="1" />
<field name="create_date" readonly="1"/> <field name="create_date" readonly="1" />
</group> </group>
</group> </group>
<group> <group>
<field name="name" placeholder="Rev 01"/> <field name="name" placeholder="Rev 01" />
<field name="summary" placeholder="eg: Changed ... for ..."/> <field name="summary" placeholder="eg: Changed ... for ..." />
</group> </group>
<notebook> <notebook>
<page name="content" string="Content"> <page name="content" string="Content">
<field name="content" widget="html" placeholder="e.g. Once upon a time..." options="{'safe': True}"/> <field
name="content"
widget="html"
placeholder="e.g. Once upon a time..."
options="{'safe': True}"
/>
</page> </page>
<page name="diff" string="Changes"> <page name="diff" string="Changes">
<field name="diff" widget="html" style="overflow-x: scroll" /> <field
name="diff"
widget="html"
style="overflow-x: scroll"
/>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
</form> </form>
</field> </field>
</record> </record>
<!-- History Action --> <!-- History Action -->
<record model="ir.actions.act_window" id="action_history"> <record model="ir.actions.act_window" id="action_history">
<field name="name">Page history</field> <field name="name">Page history</field>
<field name="res_model">document.page.history</field> <field name="res_model">document.page.history</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem
<menuitem id="menu_page_history" id="menu_page_history"
parent="menu_wiki" parent="menu_wiki"
name="Pages history" name="Pages history"
action="action_history" action="action_history"
sequence="30" sequence="30"
groups="base.group_no_one" /> groups="base.group_no_one"
/>
<act_window id="action_related_page_history" <act_window
id="action_related_page_history"
context="{'search_default_page_id': [active_id], 'default_page_id': active_id}" context="{'search_default_page_id': [active_id], 'default_page_id': active_id}"
domain="[('page_id','=',active_id)]" domain="[('page_id','=',active_id)]"
name="Page History" name="Page History"
res_model="document.page.history" res_model="document.page.history"
binding_model="document.page"/> binding_model="document.page"
/>
</odoo> </odoo>

View File

@ -1,16 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<template id="report_documentpage_doc"> <template id="report_documentpage_doc">
<t t-call="web.external_layout"> <t t-call="web.external_layout">
<div class="page"> <div class="page">
<h1 t-field="doc.name" /> <h1 t-field="doc.name" />
<div t-raw="doc.content" /> <div t-raw="doc.content" />
</div> </div>
</t> </t>
</template> </template>
<template id="report_documentpage"> <template id="report_documentpage">
<t t-call="web.html_container"> <t t-call="web.html_container">
<t t-foreach="docs" t-as="doc"> <t t-foreach="docs" t-as="doc">
@ -18,7 +15,6 @@
</t> </t>
</t> </t>
</template> </template>
<report <report
id="report_document_page" id="report_document_page"
string="Document Page" string="Document Page"
@ -27,5 +23,4 @@
file="document_page.report_documentpage" file="document_page.report_documentpage"
name="document_page.report_documentpage" name="document_page.report_documentpage"
/> />
</odoo> </odoo>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<!-- Create Menu From view --> <!-- Create Menu From view -->
<record id="view_wiki_create_menu" model="ir.ui.view"> <record id="view_wiki_create_menu" model="ir.ui.view">
<field name="name">Create Menu</field> <field name="name">Create Menu</field>
@ -12,25 +11,24 @@
<field name="menu_parent_id" /> <field name="menu_parent_id" />
</group> </group>
<footer> <footer>
<button name="document_page_menu_create" <button
string="Create Menu" name="document_page_menu_create"
type="object" string="Create Menu"
class="oe_highlight" /> type="object"
class="oe_highlight"
/>
or or
<button string="Cancel" <button string="Cancel" class="oe_link" special="cancel" />
class="oe_link"
special="cancel" />
</footer> </footer>
</form> </form>
</field> </field>
</record> </record>
<act_window <act_window
id="action_related_page_create_menu" id="action_related_page_create_menu"
name="Create Menu" name="Create Menu"
res_model="document.page.create.menu" res_model="document.page.create.menu"
target="new" target="new"
view_mode="form" view_mode="form"
binding_model="document.page"/> binding_model="document.page"
/>
</odoo> </odoo>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<!-- Create Index Form view --> <!-- Create Index Form view -->
<record id="view_wiki_show_diff" model="ir.ui.view"> <record id="view_wiki_show_diff" model="ir.ui.view">
<field name="name">Show Difference</field> <field name="name">Show Difference</field>
@ -14,14 +13,13 @@
</form> </form>
</field> </field>
</record> </record>
<!-- Create Index Action Window --> <!-- Create Index Action Window -->
<act_window <act_window
id="action_view_wiki_show_diff_values" id="action_view_wiki_show_diff_values"
name="Difference" name="Difference"
res_model="wizard.document.page.history.show_diff" res_model="wizard.document.page.history.show_diff"
binding_model="document.page.history" binding_model="document.page.history"
view_mode="form" view_mode="form"
target="new"/> target="new"
/>
</odoo> </odoo>