[gen] Bugfixes.

This commit is contained in:
Gaetan Delannay 2014-12-15 10:30:24 +01:00
parent 8511c22612
commit 50bd996c3b
5 changed files with 17 additions and 8 deletions

View file

@ -64,7 +64,7 @@ class Field:
value=not isSearch and \
field.getFormattedValue(zobj, rawValue, showChanges);
requestValue=not isSearch and zobj.getRequestFieldValue(name);
inRequest=field.valueIsInRequest(zobj, req, name);
inRequest=field.valueIsInRequest(zobj, req, name, layoutType);
error=req.get('%s_error' % name);
isMultiple=(field.multiplicity[1] == None) or \
(field.multiplicity[1] > 1);
@ -654,7 +654,7 @@ class Field:
index = tool.getApp().catalog.Indexes[indexName]
return index.getEntryForObject(catalogBrain.getRID())
def valueIsInRequest(self, obj, request, name):
def valueIsInRequest(self, obj, request, name, layoutType):
'''Is there a value corresponding to this field in the request? p_name
can be different from self.name (ie, if it is a field within another
(List) field). In most cases, checking that this p_name is in the

View file

@ -528,10 +528,14 @@ class String(Field):
if isinstance(res, dict): res = res.copy()
return res
def valueIsInRequest(self, obj, request, name):
def valueIsInRequest(self, obj, request, name, layoutType):
# If we are on the search layout, p_obj, if not None, is certainly not
# the p_obj we want here (can be a home object).
if layoutType == 'search':
return Field.valueIsInRequest(self, obj, request, name, layoutType)
languages = self.getAttribute(obj, 'languages')
if len(languages) == 1:
return Field.valueIsInRequest(self, obj, request, name)
return Field.valueIsInRequest(self, obj, request, name, layoutType)
# Is is sufficient to check that at least one of the language-specific
# values is in the request.
return request.has_key('%s_%s' % (name, languages[0]))