From 788b1bdb5b2809c44fb814b4ebf67bd23efa6f32 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 3 Aug 2012 17:46:41 +0200 Subject: [REM] correctly rename and remove wiki bzr revid: al@openerp.com-20120803154641-ocbydlqt7ppjecwn --- .../wizard/document_page_show_diff.py | 69 ++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 addons/document_page/wizard/document_page_show_diff.py (limited to 'addons/document_page/wizard/document_page_show_diff.py') diff --git a/addons/document_page/wizard/document_page_show_diff.py b/addons/document_page/wizard/document_page_show_diff.py new file mode 100644 index 00000000000..fc5711ce733 --- /dev/null +++ b/addons/document_page/wizard/document_page_show_diff.py @@ -0,0 +1,69 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields, osv +from tools.translate import _ +import base64 + +class showdiff(osv.osv_memory): + """ Disp[ay Difference for History """ + + _name = 'wizard.document.page.history.show_diff' + + def get_diff(self, cr, uid, context=None): + + """ @param cr: the current row, from the database cursor, + @param uid: the current user’s ID for security checks, + """ + if context is None: + context = {} + history = self.pool.get('document.page.history') + ids = context.get('active_ids', []) + + diff = "" + if len(ids) == 2: + if ids[0] > ids[1]: + diff = base64.encodestring(history.getDiff(cr, uid, ids[1], ids[0])) + else: + diff = base64.encodestring(history.getDiff(cr, uid, ids[0], ids[1])) + + elif len(ids) == 1: + old = history.browse(cr, uid, ids[0]) + nids = history.search(cr, uid, [('document_id', '=', old.document_id.id)]) + nids.sort() + diff = base64.encodestring(history.getDiff(cr, uid, ids[0], nids[-1])) + else: + raise osv.except_osv(_('Warning'), _('You need to select minimum 1 or maximum 2 history revision!')) + + + return diff + + _columns = { + 'file_path':fields.binary('Diff', readonly=True), + } + + _defaults = { + 'file_path': get_diff + } + +showdiff() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3 From bda8f3fb7f675957b7e0b1245a21196c11b47865 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 10 Aug 2012 02:09:08 +0200 Subject: page mostly ok bzr revid: al@openerp.com-20120810000908-ujg81v4mgm22glem --- addons/document_page/wizard/document_page_show_diff.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'addons/document_page/wizard/document_page_show_diff.py') diff --git a/addons/document_page/wizard/document_page_show_diff.py b/addons/document_page/wizard/document_page_show_diff.py index 9615bfa2067..ab5572768f4 100644 --- a/addons/document_page/wizard/document_page_show_diff.py +++ b/addons/document_page/wizard/document_page_show_diff.py @@ -29,10 +29,6 @@ class showdiff(osv.osv_memory): _name = 'wizard.document.page.history.show_diff' def get_diff(self, cr, uid, context=None): - - """ @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - """ if context is None: context = {} history = self.pool.get('document.page.history') @@ -41,29 +37,25 @@ class showdiff(osv.osv_memory): diff = "" if len(ids) == 2: if ids[0] > ids[1]: - diff = base64.encodestring(history.getDiff(cr, uid, ids[1], ids[0])) + diff = history.getDiff(cr, uid, ids[1], ids[0]) else: - diff = base64.encodestring(history.getDiff(cr, uid, ids[0], ids[1])) + diff = history.getDiff(cr, uid, ids[0], ids[1]) elif len(ids) == 1: old = history.browse(cr, uid, ids[0]) nids = history.search(cr, uid, [('document_id', '=', old.document_id.id)]) nids.sort() - diff = base64.encodestring(history.getDiff(cr, uid, ids[0], nids[-1])) + diff = history.getDiff(cr, uid, ids[0], nids[-1]) else: raise osv.except_osv(_('Warning!'), _('You need to select minimum one or maximum two history revisions!')) - - return diff _columns = { - 'file_path':fields.binary('Diff', readonly=True), + 'diff': fields.text('Diff', readonly=True), } _defaults = { - 'file_path': get_diff + 'diff': get_diff } -showdiff() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3