Merge lp:~therp-nl/openupgrade-server/7.0-allow_view_breakage into lp:openupgrade-server

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 4623
Proposed branch: lp:~therp-nl/openupgrade-server/7.0-allow_view_breakage
Merge into: lp:openupgrade-server
Diff against target: 18 lines (+6/-2)
1 file modified
openerp/addons/base/ir/ir_ui_view.py (+6/-2)
To merge this branch: bzr merge lp:~therp-nl/openupgrade-server/7.0-allow_view_breakage
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) code review Approve
Review via email: mp+176666@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

Maybe make it clearer in the message that this is an expected error and can safely be ignored in many cases?

review: Approve (code review)
4620. By Stefan Rijnhart (Opener)

[IMP] Warning text

Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Good idea. Done.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openerp/addons/base/ir/ir_ui_view.py'
--- openerp/addons/base/ir/ir_ui_view.py 2013-04-15 10:57:44 +0000
+++ openerp/addons/base/ir/ir_ui_view.py 2013-07-24 17:25:35 +0000
@@ -126,8 +126,12 @@
126 fvg = self.pool.get(view.model).fields_view_get(cr, uid, view_id=view.id, view_type=view.type, context=context)126 fvg = self.pool.get(view.model).fields_view_get(cr, uid, view_id=view.id, view_type=view.type, context=context)
127 return fvg['arch']127 return fvg['arch']
128 except:128 except:
129 _logger.exception("Can't render view %s for model: %s", view.xml_id, view.model)129 # OpenUpgrade: do not break on unrenderable views
130 return False130 _logger.warn("Can't render view %s for model: %s. If you are "
131 "migrating between major versions of OpenERP, "
132 "this is to be expected (otherwise, do not run "
133 "OpenUpgrade server).", view.xml_id, view.model)
134 return "<data/>"
131135
132 def _check_xml(self, cr, uid, ids, context=None):136 def _check_xml(self, cr, uid, ids, context=None):
133 for view in self.browse(cr, uid, ids, context):137 for view in self.browse(cr, uid, ids, context):

Subscribers

People subscribed via source and target branches