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

Proposed by Mohammed Shekha(Open ERP) on 2013-05-29
Status: Merged
Approved by: Naresh(OpenERP) on 2013-10-15
Approved revision: no longer in the source branch.
Merged at revision: 9595
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-593069-msh
Merge into: lp:openobject-addons/7.0
Diff against target: 16 lines (+5/-1)
1 file modified
pad/ (+5/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-593069-msh
Reviewer Review Type Date Requested Status
Martin Trigaux (OpenERP) (community) 2013-09-24 Approve on 2013-11-18
Naresh(OpenERP) (community) 2013-09-24 Approve on 2013-10-15
OpenERP Core Team 2013-05-29 Pending
Review via email:

Description of the change


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.


To post a comment you must log in.
review: Approve

LGTM, thanks for the patch

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pad/'
2--- pad/ 2013-04-19 14:42:38 +0000
3+++ pad/ 2013-05-29 07:02:26 +0000
4@@ -39,7 +39,11 @@
5 #if create with content
6 if "field_name" in context and "model" in context and "object_id" in context:
7 myPad = EtherpadLiteClient( pad["key"], pad["server"]+'/api')
8- myPad.createPad(path)
9+ try:
10+ myPad.createPad(path)
11+ except urllib2.URLError:
12+ raise osv.except_osv(_("Error"), _("Pad creation fail, \
13+ either there is a problem with your pad server URL or with your connection."))
15 #get attr on the field model
16 model = self.pool.get(context["model"])