odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] bug lp:730746 

bzr revid: tfr@openerp.com-20110309093205-aiq6kscljyr6w3rx
This commit is contained in:
Thibault Francois 2011-03-09 10:32:05 +01:00
parent b7b0b24321 13d3c639fa
commit 04434d72e5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/wiki/wiki.py
View File

@ -23,6 +23,7 @@
from osv import fields, osv
from tools.translate import _
import difflib
import tools
class wiki_wiki(osv.osv):
""" wiki """
@ -229,9 +230,9 @@ class wiki_history(osv.osv):
text2 = history_pool.read(cr, uid, [v2], ['text_area'])[0]['text_area']
line1 = line2 = ''
if text1:
line1 = text1.splitlines(1)
line1 = tools.ustr(text1.splitlines(1))
if text2:
line2 = text2.splitlines(1)
line2=tools.ustr(text2.splitlines(1))
if (not line1 and not line2) or (line1 == line2):
raise osv.except_osv(_('Warning !'), _('There are no changes in revisions'))
diff = difflib.HtmlDiff()