1
=== modified file 'openerp/osv/orm.py'
2
--- openerp/osv/orm.py	2012-07-02 16:20:22 +0000
3
+++ openerp/osv/orm.py	2012-07-09 16:20:39 +0000
4
@@ -2154,8 +2154,11 @@
5
2154
                view = getattr(self, '_get_default_%s_view' % view_type)(
2154
                view = getattr(self, '_get_default_%s_view' % view_type)(
6
2155
                    cr, user, context)
2155
                    cr, user, context)
7
2156
            except AttributeError:
2156
            except AttributeError:
10
2157
                # what happens here, graph case?
2157
                if config['debug_mode']:
11
2158
                raise except_orm(_('Invalid Architecture!'), _("There is no view of type '%s' defined for the structure!") % view_type)
2158
                    raise
12
2159
                else:
13
2160
                    # what happens here, graph case?
14
2161
                    raise except_orm(_('Invalid Architecture!'), _("There is no view of type '%s' defined for the structure!") % view_type)
15
2159
2162
16
2160
            result.update(
2163
            result.update(
17
2161
                arch=view,
2164
                arch=view,
18
2162
2165
19
=== modified file 'openerp/osv/osv.py'
20
--- openerp/osv/osv.py	2012-01-24 12:42:52 +0000
21
+++ openerp/osv/osv.py	2012-07-09 16:20:39 +0000
22
@@ -33,6 +33,7 @@
23
33
from openerp.tools.translate import translate
33
from openerp.tools.translate import translate
24
34
from openerp.osv.orm import MetaModel, Model, TransientModel, AbstractModel
34
from openerp.osv.orm import MetaModel, Model, TransientModel, AbstractModel
25
35
import openerp.exceptions
35
import openerp.exceptions
26
36
from openerp.tools.config import config
27
36
37
28
37
_logger = logging.getLogger(__name__)
38
_logger = logging.getLogger(__name__)
29
38
39
30
@@ -120,37 +121,43 @@
31
120
                    raise except_osv('Database not ready', 'Currently, this database is not fully loaded and can not be used.')
121
                    raise except_osv('Database not ready', 'Currently, this database is not fully loaded and can not be used.')
32
121
                return f(self, dbname, *args, **kwargs)
122
                return f(self, dbname, *args, **kwargs)
33
122
            except orm.except_orm, inst:
123
            except orm.except_orm, inst:
35
123
                raise except_osv(inst.name, inst.value)
124
                if config['debug_mode']:
36
125
                    raise
37
126
                else:
38
127
                    raise except_osv(inst.name, inst.value)
39
124
            except except_osv:
128
            except except_osv:
40
125
                raise
129
                raise
41
126
            except IntegrityError, inst:
130
            except IntegrityError, inst:
67
127
                osv_pool = pooler.get_pool(dbname)
131
                if config['debug_mode']:
68
128
                for key in osv_pool._sql_error.keys():
132
                    raise
44
129
                    if key in inst[0]:
45
130
                        netsvc.abort_response(1, _('Constraint Error'), 'warning',
46
131
                                        tr(osv_pool._sql_error[key], 'sql_constraint') or inst[0])
47
132
                if inst.pgcode in (errorcodes.NOT_NULL_VIOLATION, errorcodes.FOREIGN_KEY_VIOLATION, errorcodes.RESTRICT_VIOLATION):
48
133
                    msg = _('The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set')
49
134
                    _logger.debug("IntegrityError", exc_info=True)
50
135
                    try:
51
136
                        errortxt = inst.pgerror.replace('«','"').replace('»','"')
52
137
                        if '"public".' in errortxt:
53
138
                            context = errortxt.split('"public".')[1]
54
139
                            model_name = table = context.split('"')[1]
55
140
                        else:
56
141
                            last_quote_end = errortxt.rfind('"')
57
142
                            last_quote_begin = errortxt.rfind('"', 0, last_quote_end)
58
143
                            model_name = table = errortxt[last_quote_begin+1:last_quote_end].strip()
59
144
                        model = table.replace("_",".")
60
145
                        model_obj = osv_pool.get(model)
61
146
                        if model_obj:
62
147
                            model_name = model_obj._description or model_obj._name
63
148
                        msg += _('\n\n[object with reference: %s - %s]') % (model_name, model)
64
149
                    except Exception:
65
150
                        pass
66
151
                    netsvc.abort_response(1, _('Integrity Error'), 'warning', msg)
69
152
                else:
133
                else:
71
153
                    netsvc.abort_response(1, _('Integrity Error'), 'warning', inst[0])
134
                    osv_pool = pooler.get_pool(dbname)
72
135
                    for key in osv_pool._sql_error.keys():
73
136
                        if key in inst[0]:
74
137
                            netsvc.abort_response(1, _('Constraint Error'), 'warning',
75
138
                                            tr(osv_pool._sql_error[key], 'sql_constraint') or inst[0])
76
139
                    if inst.pgcode in (errorcodes.NOT_NULL_VIOLATION, errorcodes.FOREIGN_KEY_VIOLATION, errorcodes.RESTRICT_VIOLATION):
77
140
                        msg = _('The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set')
78
141
                        _logger.debug("IntegrityError", exc_info=True)
79
142
                        try:
80
143
                            errortxt = inst.pgerror.replace('«','"').replace('»','"')
81
144
                            if '"public".' in errortxt:
82
145
                                context = errortxt.split('"public".')[1]
83
146
                                model_name = table = context.split('"')[1]
84
147
                            else:
85
148
                                last_quote_end = errortxt.rfind('"')
86
149
                                last_quote_begin = errortxt.rfind('"', 0, last_quote_end)
87
150
                                model_name = table = errortxt[last_quote_begin+1:last_quote_end].strip()
88
151
                            model = table.replace("_",".")
89
152
                            model_obj = osv_pool.get(model)
90
153
                            if model_obj:
91
154
                                model_name = model_obj._description or model_obj._name
92
155
                            msg += _('\n\n[object with reference: %s - %s]') % (model_name, model)
93
156
                        except Exception:
94
157
                            pass
95
158
                        netsvc.abort_response(1, _('Integrity Error'), 'warning', msg)
96
159
                    else:
97
160
                        netsvc.abort_response(1, _('Integrity Error'), 'warning', inst[0])
98
154
            except Exception:
161
            except Exception:
99
155
                _logger.exception("Uncaught exception")
162
                _logger.exception("Uncaught exception")
100
156
                raise
163
                raise
Status:	Rejected
Rejected by:	Vo Minh Thu on 2012-10-08
Proposed branch:	lp:~sebastien.beau/openobject-server/openobject-server-debug-mode
Merge into:	lp:openobject-server
Diff against target:	100 lines (+39/-29) 2 files modified openerp/osv/orm.py (+5/-2) openerp/osv/osv.py (+34/-27)
To merge this branch:	bzr merge lp:~sebastien.beau/openobject-server/openobject-server-debug-mode
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Vo Minh Thu	2012-07-11	Pending
OpenERP Core Team	2012-07-09	Pending
Review via email: mp+113996@code.launchpad.net