From 71d81fff4d1a7086b988fad462a11df0eebaeec9 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 9 Nov 2012 12:00:02 +0530
Subject: [PATCH 1/2] [IMP] Set api key in demo file and remove key from pad.py

bzr revid: tta@openerp.com-20121109063002-ej4bmzzxut5j12e7
---
 addons/pad/pad.py       | 2 +-
 addons/pad/pad_demo.xml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index e5b36e5f64c..932fc5a21a4 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -19,7 +19,7 @@ class pad_common(osv.osv_memory):
 
         pad = {
             "server" : company.pad_server,
-            "key" : company.pad_key or "4DxmsNIbnQUVQMW9S9tx2oLOSjFdrx1l",
+            "key" : company.pad_key,
         }
 
         # make sure pad server in the form of http://hostname
diff --git a/addons/pad/pad_demo.xml b/addons/pad/pad_demo.xml
index 407f90e8242..0213e3410cf 100644
--- a/addons/pad/pad_demo.xml
+++ b/addons/pad/pad_demo.xml
@@ -4,6 +4,10 @@
     <record id="base.main_company" model="res.company">
       <field name="pad_server">pad.openerp.com</field>
     </record>
+    
+    <record id="base.main_company" model="res.company">
+      <field name="pad_key">4DxmsNIbnQUVQMW9S9tx2oLOSjFdrx1l</field>
+    </record>
 
   </data>
 </openerp>

From 8be63a00435d7757ccb1cba171700041efca3672 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 9 Nov 2012 12:21:44 +0530
Subject: [PATCH 2/2] [FIX] Corrected etherpad rending issue.

bzr revid: tta@openerp.com-20121109065144-hut93odny1ur16db
---
 addons/pad/static/src/js/pad.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 7c6b2a639c1..929d62681c8 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -14,6 +14,7 @@ openerp.pad = function(instance) {
                         object_id: self.view.datarecord.id
                     }}).done(function(data) {
                     if(data&&data.url){
+                        self.set({value: data.url});
                         _super(data.url);
                         self.renderElement();
                     }