From ccb2731a49ea33b1a0a3a1dfca5a09ce7163e300 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 20 Apr 2012 19:07:43 +0530
Subject: [PATCH] in project widget='etherpad' added

bzr revid: tta@openerp.com-20120420133743-2o5d0spxwfxin0yo
---
 addons/project/project_view.xml                   | 2 +-
 addons/web_etherpad/static/src/js/web_etherpad.js | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 63898cb518d..a5498e9849d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -262,7 +262,7 @@
                                 <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
                             </group>
 
-                            <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}"/>
+                            <field colspan="4" name="description" widget="etherpad" nolabel="1"  attrs="{'readonly':[('state','=','done')]}"/>
                             <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />
diff --git a/addons/web_etherpad/static/src/js/web_etherpad.js b/addons/web_etherpad/static/src/js/web_etherpad.js
index 22f21cd1e67..defcf5db76e 100755
--- a/addons/web_etherpad/static/src/js/web_etherpad.js
+++ b/addons/web_etherpad/static/src/js/web_etherpad.js
@@ -63,10 +63,9 @@ openerp.web_etherpad = function (instance) {
                 {
                     var self = this;
                     if(show_value.split('\n')[0] != '')             
-                        $.get(show_value.split('\n')[0]+'/export/html', function(data) {                                      
-                        console.log(data);                    
-                            self.$element.html(data);
-                        });
+                        $.get(show_value.split('\n')[0]+'/export/html')
+                        .success(function(data) { self.$element.html(data); })
+                        .error(function() { self.$element.text('Unable to load pad'); });
                     else
                         self.$element.text(show_value);
                 }