[IMP] document_page: black, isort

This commit is contained in:
ernesto
2019-11-06 17:58:38 -05:00
committed by Justine Doutreloux
parent 6aa4dece1f
commit 4cf81af527
10 changed files with 189 additions and 217 deletions

View File

@@ -1,7 +1,7 @@
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import api, fields, models, _
from odoo import _, api, fields, models
from odoo.exceptions import ValidationError
@@ -9,48 +9,42 @@ class DocumentPage(models.Model):
"""This class is use to manage Document."""
_name = "document.page"
_inherit = ['mail.thread', 'mail.activity.mixin']
_inherit = ["mail.thread", "mail.activity.mixin"]
_description = "Document Page"
_order = 'name'
_order = "name"
name = fields.Char('Title', required=True)
name = fields.Char("Title", required=True)
type = fields.Selection(
[('content', 'Content'), ('category', 'Category')],
'Type',
[("content", "Content"), ("category", "Category")],
"Type",
help="Page type",
default="content"
default="content",
)
active = fields.Boolean(default=True)
parent_id = fields.Many2one(
'document.page',
'Category',
domain=[('type', '=', 'category')]
)
child_ids = fields.One2many(
'document.page',
'parent_id',
'Children'
"document.page", "Category", domain=[("type", "=", "category")]
)
child_ids = fields.One2many("document.page", "parent_id", "Children")
content = fields.Text(
"Content",
compute='_compute_content',
inverse='_inverse_content',
search='_search_content',
compute="_compute_content",
inverse="_inverse_content",
search="_search_content",
required=True,
)
# no-op computed field
draft_name = fields.Char(
string='Name',
help='Name for the changes made',
string="Name",
help="Name for the changes made",
compute=lambda x: x,
inverse=lambda x: x,
)
# no-op computed field
draft_summary = fields.Char(
string='Summary',
help='Describe the changes made',
string="Summary",
help="Describe the changes made",
compute=lambda x: x,
inverse=lambda x: x,
)
@@ -58,58 +52,54 @@ class DocumentPage(models.Model):
template = fields.Html(
"Template",
help="Template that will be used as a content template "
"for all new page of this category.",
"for all new page of this category.",
)
history_head = fields.Many2one(
'document.page.history',
'HEAD',
compute='_compute_history_head',
"document.page.history",
"HEAD",
compute="_compute_history_head",
store=True,
auto_join=True,
)
history_ids = fields.One2many(
'document.page.history',
'page_id',
'History',
order='create_date DESC',
readonly=True,
)
menu_id = fields.Many2one(
'ir.ui.menu',
"Menu",
"document.page.history",
"page_id",
"History",
order="create_date DESC",
readonly=True,
)
menu_id = fields.Many2one("ir.ui.menu", "Menu", readonly=True)
content_date = fields.Datetime(
'Last Contribution Date',
related='history_head.create_date',
"Last Contribution Date",
related="history_head.create_date",
store=True,
index=True,
readonly=True,
)
content_uid = fields.Many2one(
'res.users',
'Last Contributor',
related='history_head.create_uid',
"res.users",
"Last Contributor",
related="history_head.create_uid",
store=True,
index=True,
readonly=True,
)
company_id = fields.Many2one(
'res.company',
'Company',
help='If set, page is accessible only from this company',
"res.company",
"Company",
help="If set, page is accessible only from this company",
index=True,
ondelete='cascade',
ondelete="cascade",
)
backend_url = fields.Char(
string='Backend URL',
help='Use it to link resources univocally',
compute='_compute_backend_url',
string="Backend URL",
help="Use it to link resources univocally",
compute="_compute_backend_url",
)
@api.depends('menu_id', 'parent_id.menu_id')
@api.depends("menu_id", "parent_id.menu_id")
def _compute_backend_url(self):
tmpl = '/web#id={}&model=document.page&view_type=form'
tmpl = "/web#id={}&model=document.page&view_type=form"
for rec in self:
url = tmpl.format(rec.id)
# retrieve action
@@ -119,13 +109,13 @@ class DocumentPage(models.Model):
action = parent.menu_id.action
parent = parent.parent_id
if action:
url += '&action={}'.format(action.id)
url += "&action={}".format(action.id)
rec.backend_url = url
@api.constrains('parent_id')
@api.constrains("parent_id")
def _check_parent_id(self):
if not self._check_recursion():
raise ValidationError(_('You cannot create recursive categories.'))
raise ValidationError(_("You cannot create recursive categories."))
@api.multi
def _get_page_index(self, link=True):
@@ -134,7 +124,7 @@ class DocumentPage(models.Model):
index = []
for subpage in self.child_ids:
index += ["<li>" + subpage._get_page_index() + "</li>"]
r = ''
r = ""
if link:
r = '<a href="{}">{}</a>'.format(self.backend_url, self.name)
if index:
@@ -142,35 +132,36 @@ class DocumentPage(models.Model):
return r
@api.multi
@api.depends('history_head')
@api.depends("history_head")
def _compute_content(self):
for rec in self:
if rec.type == 'category':
if rec.type == "category":
rec.content = rec._get_page_index(link=False)
else:
if rec.history_head:
rec.content = rec.history_head.content
else:
# html widget's default, so it doesn't trigger ghost save
rec.content = '<p><br></p>'
rec.content = "<p><br></p>"
@api.multi
def _inverse_content(self):
for rec in self:
if rec.type == 'content' and \
rec.content != rec.history_head.content:
rec._create_history({
'name': rec.draft_name,
'summary': rec.draft_summary,
'content': rec.content,
})
if rec.type == "content" and rec.content != rec.history_head.content:
rec._create_history(
{
"name": rec.draft_name,
"summary": rec.draft_summary,
"content": rec.content,
}
)
@api.multi
def _search_content(self, operator, value):
return [('history_head.content', operator, value)]
return [("history_head.content", operator, value)]
@api.multi
@api.depends('history_ids')
@api.depends("history_ids")
def _compute_history_head(self):
for rec in self:
if rec.history_ids:
@@ -179,20 +170,20 @@ class DocumentPage(models.Model):
@api.multi
def _create_history(self, vals):
self.ensure_one()
history = self.env['document.page.history']
vals['page_id'] = self.id
history = self.env["document.page.history"]
vals["page_id"] = self.id
return history.create(vals)
@api.onchange("parent_id")
def _onchange_parent_id(self):
"""We Set it the right content to the new parent."""
if not self.content or self.content == '<p><br></p>':
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
self.content = self.parent_id.template
@api.multi
def unlink(self):
menus = self.mapped('menu_id')
menus = self.mapped("menu_id")
res = super().unlink()
menus.unlink()
return res

View File

@@ -2,6 +2,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
import difflib
from odoo import api, fields, models
from odoo.tools.translate import _
@@ -11,19 +12,19 @@ class DocumentPageHistory(models.Model):
_name = "document.page.history"
_description = "Document Page History"
_order = 'id DESC'
_order = "id DESC"
page_id = fields.Many2one('document.page', 'Page', ondelete='cascade')
page_id = fields.Many2one("document.page", "Page", ondelete="cascade")
name = fields.Char(index=True)
summary = fields.Char(index=True)
content = fields.Text()
diff = fields.Text(compute='_compute_diff')
diff = fields.Text(compute="_compute_diff")
company_id = fields.Many2one(
'res.company',
'Company',
help='If set, page is accessible only from this company',
related='page_id.company_id',
"res.company",
"Company",
help="If set, page is accessible only from this company",
related="page_id.company_id",
store=True,
index=True,
readonly=True,
@@ -32,13 +33,16 @@ class DocumentPageHistory(models.Model):
@api.multi
def _compute_diff(self):
"""Shows a diff between this version and the previous version"""
history = self.env['document.page.history']
history = self.env["document.page.history"]
for rec in self:
prev = history.search([
('page_id', '=', rec.page_id.id),
('create_date', '<', rec.create_date)],
prev = history.search(
[
("page_id", "=", rec.page_id.id),
("create_date", "<", rec.create_date),
],
limit=1,
order='create_date DESC')
order="create_date DESC",
)
if prev:
rec.diff = self._get_diff(prev.id, rec.id)
else:
@@ -47,23 +51,24 @@ class DocumentPageHistory(models.Model):
@api.model
def _get_diff(self, v1, v2):
"""Return the difference between two version of document version."""
text1 = v1 and self.browse(v1).content or ''
text2 = v2 and self.browse(v2).content or ''
text1 = v1 and self.browse(v1).content or ""
text2 = v2 and self.browse(v2).content or ""
# Include line breaks to make it more readable
# TODO: consider using a beautify library directly on the content
text1 = text1.replace('</p><p>', '</p>\r\n<p>')
text2 = text2.replace('</p><p>', '</p>\r\n<p>')
text1 = text1.replace("</p><p>", "</p>\r\n<p>")
text2 = text2.replace("</p><p>", "</p>\r\n<p>")
line1 = text1.splitlines(True)
line2 = text2.splitlines(True)
if line1 == line2:
return _('There are no changes in revisions.')
return _("There are no changes in revisions.")
else:
diff = difflib.HtmlDiff()
return diff.make_table(
line1, line2,
line1,
line2,
"Revision-{}".format(v1),
"Revision-{}".format(v2),
context=True
context=True,
)
@api.multi