tryton-do/tryton
2
0 Fork 0
Code Issues Pull Requests 2 Actions 2 Packages Projects Releases Wiki Activity

Added test on model before expr_eval call

Browse Source
This commit is contained in:
Bertrand Chenal committed 2008-11-25 23:21:40 +01:00
1 parent 12157425ed
commit 92f2817972
2 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tryton/gui/window/view_form/model/field.py
-1
View File
@@ -134,7 +134,6 @@ class CharField(object):
log = logging.getLogger('record')
log.error("Unable to eval %s for field %s (record id: %s)."% \
(state_changes['value'], self.name, model.id))
return
if value:
self.set(model, value, modified=True)
tryton/gui/window/view_form/view/form_gtk/parser.py
+8 -7
View File
@@ -95,7 +95,7 @@ class Button(object):
return
if 'invisible' in state_changes:
try:
if model.expr_eval(state_changes['invisible'],
if model and model.expr_eval(state_changes['invisible'],
check_load=False):
self.widget.hide()
else:
@@ -111,7 +111,7 @@ class Button(object):
self.widget.show()
if 'readonly' in state_changes:
try:
if model.expr_eval(state_changes['readonly'],
if model and model.expr_eval(state_changes['readonly'],
check_load=False):
self.widget.set_sensitive(False)
else:
@@ -128,7 +128,8 @@ class Button(object):
self.widget.set_sensitive(True)
if 'icon' in state_changes:
try:
stock = model.expr_eval(state_changes['icon'], check_load=False)
stock = model and model.expr_eval(
state_changes['icon'], check_load=False)
if stock:
try:
icon = gtk.Image()
@@ -159,7 +160,7 @@ class Label(gtk.Label):
if isinstance(state_changes, basestring):
state_changes = eval(state_changes)
if 'invisible' in state_changes:
if model.expr_eval(state_changes['invisible'],
if model and model.expr_eval(state_changes['invisible'],
check_load=False):
self.hide()
else:
@@ -187,7 +188,7 @@ class VBox(gtk.VBox):
if isinstance(state_changes, basestring):
state_changes = eval(state_changes)
if 'invisible' in state_changes:
if model.expr_eval(state_changes['invisible'],
if model and model.expr_eval(state_changes['invisible'],
check_load=False):
self.hide()
else:
@@ -214,7 +215,7 @@ class Image(gtk.Image):
if isinstance(state_changes, basestring):
state_changes = eval(state_changes)
if 'invisible' in state_changes:
if mode.expr_eval(state_changes['invisible'],
if model and model.expr_eval(state_changes['invisible'],
check_load=False):
self.hide()
else:
@@ -271,7 +272,7 @@ class ScrolledWindow(gtk.ScrolledWindow):
if isinstance(state_changes, basestring):
state_changes = eval(state_changes)
if 'invisible' in state_changes:
if model.expr_eval(state_changes['invisible'],
if model and model.expr_eval(state_changes['invisible'],
check_load=False):
self.hide()
else: