NeoAnd/knowledge
1
0
Fork 0
mirror of https://github.com/OCA/knowledge.git synced 2025-12-22 21:32:18 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP][9.0] Change Requests and workflow improvements on documents (#155)

Browse Source 
* [IMP] Refactor document_page_approval to always use states, and a few code improvements
* [IMP] Add QWeb report to print document pages
* Categories don't save content
* FIX Last Contributor (uid and date). Use related fields instead of computed where possible.
Fix search views, store some fields to make them searchable, added filters
* Add api.depends on computed diff
This commit is contained in:
Iván Todorovich
2018-04-12 19:27:32 -03:00
committed by Maxime Chambreuil
parent 17d757fd95
commit 96256b9872
34 changed files with 1136 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
document_page/wizard/document_page_show_diff.py
View File

@@ -19,7 +19,7 @@
#
##############################################################################
from openerp import models, fields, _
from openerp import exceptions
from openerp.exceptions import UserError
class DocumentPageShowDiff(models.TransientModel):
@@ -27,33 +27,24 @@ class DocumentPageShowDiff(models.TransientModel):
_name = 'wizard.document.page.history.show_diff'
def get_diff(self):
def _get_diff(self):
"""Return the Difference between two document."""
history = self.env["document.page.history"]
ids = self.env.context.get('active_ids', [])
diff = ""
diff = False
if len(ids) == 2:
if ids[0] > ids[1]:
diff = history.getDiff(ids[1], ids[0])
else:
diff = history.getDiff(ids[0], ids[1])
elif len(ids) == 1:
old = history.browse(ids[0])
nids = history.search(
[('page_id', '=', old.page_id.id)],
order='id DESC',
limit=1
)
diff = history.getDiff(ids[0], nids.id)
diff = history.browse(ids[0]).diff
else:
raise exceptions.Warning(
_("Select one or maximum two history revisions!")
)
raise UserError(
_("Select one or maximum two history revisions!"))
return diff
diff = fields.Text(
'Diff',
readonly=True,
default=get_diff
default=_get_diff,
)