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

View File

@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<template id="assets_backend" name="document_page assets" inherit_id="web.assets_backend">
<template
id="assets_backend"
name="document_page assets"
inherit_id="web.assets_backend"
>
<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>
</template>
</odoo>

View File

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

View File

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

View File

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