Merge lp:~openerp-dev/openobject-addons/7.0-opw-593069-msh into lp:openobject-addons/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of pad when there is no internet connection, it throws traceback instead of user freindly message.

Demo:- To reproduce simply remove pad widget from project task description_pad field(pad_porject module) and then create record without adding any data in description_pad field and then after creating record again set widget="pad" now remove internet connetion and just open just created record.

Result: Traceback
Expected: There should be user freindly message.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Martin Trigaux (OpenERP) (mat-openerp)]

LGTM, thanks for the patch

revno: 9595 [merge]
revision-id: <email address hidden>

review: Approve

=== modified file 'pad/pad.py'
--- pad/pad.py	2013-04-19 14:42:38 +0000
+++ pad/pad.py	2013-05-29 07:02:26 +0000
@@ -39,7 +39,11 @@
         #if create with content
         if "field_name" in context and "model" in context and "object_id" in context:
             myPad = EtherpadLiteClient( pad["key"], pad["server"]+'/api')
-            myPad.createPad(path)
+            try:
+                myPad.createPad(path)
+            except urllib2.URLError:
+                raise osv.except_osv(_("Error"), _("Pad creation fail, \
+                either there is a problem with your pad server URL or with your connection."))
 
             #get attr on the field model
             model = self.pool.get(context["model"])