mirror of
https://github.com/OCA/knowledge.git
synced 2025-07-14 01:41:26 -06:00
[11.0][IMP] document_page:
* move menus to a higher level. * fix categories search view. * fix create menu action not being accessible in any way. * reorder form view, focusing in the content, not in secondary fields.
This commit is contained in:
Lois Rilo
Justine Doutreloux
parent
9b33f6d8d3
commit
729913c1f1
@ -57,6 +57,7 @@ Contributors
|
||||
* Maxime Chambreuil <mchambreuil@ursainfosystems.com>
|
||||
* Iván Todorovich <ivan.todorovich@gmail.com>
|
||||
* Jose Maria Alzaga <jose.alzaga@aselcis.com>
|
||||
* Lois Rilo <lois.rilo@eficent.com>
|
||||
|
||||
Funders
|
||||
-------
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
{
|
||||
'name': 'Document Page',
|
||||
'version': '11.0.2.2.0',
|
||||
'version': '11.0.2.3.0',
|
||||
'category': 'Knowledge Management',
|
||||
'author': 'OpenERP SA, Odoo Community Association (OCA)',
|
||||
'images': [
|
||||
@ -15,7 +15,7 @@
|
||||
'images/customer_invoice.jpeg',
|
||||
'images/page_history.png',
|
||||
],
|
||||
'website': 'http://www.openerp.com/',
|
||||
'website': 'https://github.com/OCA/knowledge',
|
||||
'license': 'AGPL-3',
|
||||
'depends': [
|
||||
'mail',
|
||||
|
||||
@ -85,7 +85,7 @@ class DocumentPage(models.Model):
|
||||
menu_id = fields.Many2one(
|
||||
'ir.ui.menu',
|
||||
"Menu",
|
||||
readonly=True
|
||||
readonly=True,
|
||||
)
|
||||
|
||||
content_date = fields.Datetime(
|
||||
@ -181,3 +181,10 @@ class DocumentPage(models.Model):
|
||||
if not self.content or self.content == '<p><br></p>':
|
||||
if self.parent_id and self.parent_id.type == "category":
|
||||
self.content = self.parent_id.template
|
||||
|
||||
@api.multi
|
||||
def unlink(self):
|
||||
menus = self.mapped('menu_id')
|
||||
res = super().unlink()
|
||||
menus.unlink()
|
||||
return res
|
||||
|
||||
@ -49,26 +49,25 @@
|
||||
<field name="name" placeholder="Name"/>
|
||||
</h1>
|
||||
<group>
|
||||
<group>
|
||||
<field name="parent_id" string="Category" context="{'default_type':'category'}"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="content_uid"/>
|
||||
<field name="content_date"/>
|
||||
<field name="menu_id" readonly="1" attrs="{'invisible': [('menu_id','=',False)]}"/>
|
||||
</group>
|
||||
<div>
|
||||
<field name="content" widget="html" placeholder="e.g. Once upon a time..." required="1" options="{'safe': True}"/>
|
||||
</div>
|
||||
</group>
|
||||
<notebook>
|
||||
<page name="content" string="Content">
|
||||
<group string="Revision" class="oe_edit_only">
|
||||
<field name="draft_name" placeholder="Rev 01" class="oe_edit_only" />
|
||||
<field name="draft_summary" placeholder="eg: Changed ... for ..." class="oe_edit_only" />
|
||||
<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)]}"/>
|
||||
</group>
|
||||
<group string="Revision" class="oe_edit_only">
|
||||
<field name="draft_name" placeholder="Rev 01" class="oe_edit_only" />
|
||||
<field name="draft_summary" placeholder="eg: Changed ... for ..." class="oe_edit_only" />
|
||||
</group>
|
||||
</group>
|
||||
<div>
|
||||
<label for="content" class="oe_edit_only"/>
|
||||
<field name="content" widget="html" placeholder="e.g. Once upon a time..." required="1" options="{'safe': True}"/>
|
||||
</div>
|
||||
</page>
|
||||
<page name="history" string="History">
|
||||
<field name="history_ids">
|
||||
@ -95,12 +94,12 @@
|
||||
<field name="name">document.page.menu.form</field>
|
||||
<field name="model">document.page</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Document Page">
|
||||
<form string="Document Page" create="0">
|
||||
<field name="type" invisible="1"/>
|
||||
<h1>
|
||||
<field name="name" placeholder="Name"/>
|
||||
</h1>
|
||||
<field name="content" 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>
|
||||
@ -160,7 +159,7 @@
|
||||
|
||||
<menuitem id="menu_wiki"
|
||||
name="Pages"
|
||||
parent="knowledge.menu_document_section"
|
||||
parent="knowledge.menu_document_root"
|
||||
sequence="10"/>
|
||||
|
||||
|
||||
|
||||
@ -51,6 +51,24 @@
|
||||
</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"/>
|
||||
<group expand="0" string="Group By...">
|
||||
<filter string="Category" context="{'group_by':'parent_id'}"/>
|
||||
<filter string="Author" context="{'group_by':'create_uid'}"/>
|
||||
<filter string="Last Contributor" context="{'group_by':'content_uid'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Category Action -->
|
||||
<record id="action_category" model="ir.actions.act_window">
|
||||
@ -61,7 +79,7 @@
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="view_category_tree"/>
|
||||
<field name="search_view_id" ref="view_wiki_filter"/>
|
||||
<field name="search_view_id" ref="view_document_category_filter"/>
|
||||
</record>
|
||||
|
||||
<record id="action_category_view_tree" model="ir.actions.act_window.view">
|
||||
|
||||
@ -51,7 +51,7 @@ class DocumentPageCreateMenu(models.TransientModel):
|
||||
'res_model': 'document.page',
|
||||
'view_id': view_id,
|
||||
'type': 'ir.actions.act_window',
|
||||
'target': 'inline',
|
||||
'target': 'current',
|
||||
}
|
||||
value['domain'] = "[('parent_id','=',%d)]" % (page.id)
|
||||
value['res_id'] = page.id
|
||||
@ -66,6 +66,8 @@ class DocumentPageCreateMenu(models.TransientModel):
|
||||
'parent_id': data.menu_parent_id.id,
|
||||
'action': 'ir.actions.act_window,' + str(action_id.id),
|
||||
})
|
||||
if page.menu_id:
|
||||
page.menu_id.unlink()
|
||||
page.write({'menu_id': menu_id.id})
|
||||
return {
|
||||
'type': 'ir.actions.client',
|
||||
|
||||
@ -26,15 +26,14 @@
|
||||
</record>
|
||||
|
||||
|
||||
<!-- Create Menu Action -->
|
||||
<record id="action_wiki_create_menu"
|
||||
model="ir.actions.act_window">
|
||||
<!-- Create Server Action -->
|
||||
<record id="action_wiki_create_menu" model="ir.actions.act_window">
|
||||
<field name="name">Create Menu</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">document.page.create.menu</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="target">new</field>
|
||||
<field name="binding_model_id"
|
||||
ref="document_page.model_document_page"/>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user