From 03d50e5f2a0ba73c4f854e63335a72873fb216cc Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Thu, 1 Feb 2018 14:31:56 +0100
Subject: [PATCH] [FIX] pad: push HTML to the pad server by default

Before this commit, when duplicating a task,
the pad of the original one was updated with plain text
Hence losing all the layout.

This was because, in all likelihood, Odoo's Etherpad server did not support pushing HTML

At the time of the commit, Odoo's pads can receive HTML.
We then push HTML by default, falling back to pushing text as before
if necessary

OPW 806064
---
 addons/pad/models/pad.py           | 18 +++++++++++-------
 addons/pad/py_etherpad/__init__.py | 14 ++++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/addons/pad/models/pad.py b/addons/pad/models/pad.py
index 0be7050db21..3ff368b8336 100644
--- a/addons/pad/models/pad.py
+++ b/addons/pad/models/pad.py
@@ -9,7 +9,6 @@ import urllib2
 
 from odoo import api, models, _
 from odoo.exceptions import UserError
-from odoo.tools import html2plaintext
 
 from ..py_etherpad import EtherpadLiteClient
 
@@ -64,9 +63,7 @@ class PadCommon(models.AbstractModel):
             # get content of the real field
             for record in model.browse([self.env.context["object_id"]]):
                 if record[real_field]:
-                    myPad.setText(path, (html2plaintext(record[real_field]).encode('utf-8')))
-                    # Etherpad for html not functional
-                    # myPad.setHTML(path, record[real_field])
+                    myPad.setHtmlFallbackText(path, record[real_field])
 
         return {
             "server": pad["server"],
@@ -76,15 +73,22 @@ class PadCommon(models.AbstractModel):
 
     @api.model
     def pad_get_content(self, url):
+        company = self.env.user.sudo().company_id
+        myPad = EtherpadLiteClient(company.pad_key, company.pad_server + '/api')
         content = ''
         if url:
+            split_url = url.split('/p/')
+            path = len(split_url) == 2 and split_url[1]
             try:
+                content = myPad.getHtml(path).get('html', '')
+            except urllib2.HTTPError:
+                _logger.warning('Http Error: the credentials might be absent for url: "%s". Falling back.' % url)
                 page = urllib2.urlopen('%s/export/html' % url).read()
                 mo = re.search('<body>(.*)</body>', page, re.DOTALL)
                 if mo:
                     content = mo.group(1)
-            except:
-                _logger.warning("No url found '%s'.", url)
+            except Exception:
+                _logger.warning("No pad found with url '%s'.", url)
         return content
 
     # TODO
@@ -121,7 +125,7 @@ class PadCommon(models.AbstractModel):
                 company = self.env.user.sudo().company_id
                 myPad = EtherpadLiteClient(company.pad_key, company.pad_server + '/api')
                 path = self[k].split('/p/')[1]
-                myPad.setText(path, (html2plaintext(vals[field.pad_content_field]).encode('utf-8')))
+                myPad.setHtmlFallbackText(path, vals[field.pad_content_field])
         # Update the `pad_content_field` if the pad is modified
         for k, v in vals.items():
             field = self._fields.get(k)
diff --git a/addons/pad/py_etherpad/__init__.py b/addons/pad/py_etherpad/__init__.py
index 0db607fe16f..da1fdb43ff4 100644
--- a/addons/pad/py_etherpad/__init__.py
+++ b/addons/pad/py_etherpad/__init__.py
@@ -3,6 +3,11 @@
 import json
 import urllib
 import urllib2
+import logging
+
+from odoo.tools import html2plaintext
+
+_logger = logging.getLogger(__name__)
 
 
 class EtherpadLiteClient:
@@ -186,6 +191,15 @@ class EtherpadLiteClient:
             "text": text
         })
 
+    def setHtmlFallbackText(self, padID, html):
+        try:
+            # Prevents malformed HTML errors
+            html_wellformed = '<html><body>' + html + '</body></html>'
+            return self.setHtml(padID, html_wellformed)
+        except Exception:
+            _logger.exception('Falling back to setText. SetHtml failed with message:')
+            return self.setText(padID, html2plaintext(html).encode('UTF-8'))
+
     def setHtml(self, padID, html):
         """sets the text of a pad from html"""
         return self.call("setHTML", {