mirror of
https://github.com/OCA/knowledge.git
synced 2025-07-13 15:34:49 -06:00
Merge 5c2ddb51ab
into 996711d2f9
This commit is contained in:
commit
57f8411a01
@ -19,6 +19,7 @@
|
||||
"license": "AGPL-3",
|
||||
"depends": ["mail", "document_knowledge"],
|
||||
"data": [
|
||||
"data/ir_config_parameter_data.xml",
|
||||
"security/document_page_security.xml",
|
||||
"security/ir.model.access.csv",
|
||||
"wizard/document_page_create_menu.xml",
|
||||
|
9
document_page/data/ir_config_parameter_data.xml
Normal file
9
document_page/data/ir_config_parameter_data.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<odoo noupdate="1">
|
||||
|
||||
<record id="document_page_wrapcolumn" model="ir.config_parameter">
|
||||
<field name="key">document_page.wrapcolumn</field>
|
||||
<field name="value">40</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
@ -54,10 +54,12 @@ class DocumentPageHistory(models.Model):
|
||||
text2 = text2.replace("</p><p>", "</p>\r\n<p>")
|
||||
line1 = text1.splitlines(True)
|
||||
line2 = text2.splitlines(True)
|
||||
params = self.env["ir.config_parameter"].sudo()
|
||||
wrapcolumn = int(params.get_param("document_page.wrapcolumn", None))
|
||||
if line1 == line2:
|
||||
return _("There are no changes in revisions.")
|
||||
else:
|
||||
diff = difflib.HtmlDiff()
|
||||
diff = difflib.HtmlDiff(wrapcolumn=wrapcolumn)
|
||||
return diff.make_table(
|
||||
line1,
|
||||
line2,
|
||||
|
Loading…
Reference in New Issue
Block a user