SAP interface: easy access to SAP results. Bugfix in search method.

This commit is contained in:
Gaetan Delannay 2009-12-21 20:45:29 +01:00
parent e89eda4838
commit 2ff08258bc
6 changed files with 61 additions and 10 deletions

View file

@ -194,6 +194,7 @@ class ArchetypeFieldDescriptor:
# field is invisible; we will display it ourselves (like for Ref fields)
alwaysAValidatorFor = ('Ref', 'Integer', 'Float')
notToValidateFields = ('Info', 'Computed', 'Action')
def walkAppyType(self):
'''Walks into the Appy type definition and gathers data about the
Archetype elements to generate.'''
@ -233,13 +234,15 @@ class ArchetypeFieldDescriptor:
# - slaves ?
if self.appyType.slaves: self.widgetParams['visible'] = False
# Archetypes will believe the field is invisible; we will display it
# ourselves (like for Ref fields)
# ourselves (like for Ref fields).
# - need to generate a field validator?
# In all cases, add an i18n message for the validation error for this
# field.
label = '%s_%s_valid' % (self.classDescr.name, self.fieldName)
poMsg = PoMessage(label, '', PoMessage.DEFAULT_VALID_ERROR)
self.generator.labels.append(poMsg)
# In all cases excepted for "immutable" fields, add an i18n message for
# the validation error for this field.
if self.appyType.type not in self.notToValidateFields:
label = '%s_%s_valid' % (self.classDescr.name, self.fieldName)
poMsg = PoMessage(label, '', PoMessage.DEFAULT_VALID_ERROR)
self.generator.labels.append(poMsg)
# Generate a validator for the field if needed.
if (type(self.appyType.validator) == types.FunctionType) or \
(type(self.appyType.validator) == type(String.EMAIL)) or \
(self.appyType.type in self.alwaysAValidatorFor):

View file

@ -124,7 +124,8 @@ class ToolMixin(AbstractMixin):
useful for some usages like knowing the number of objects without
needing to get information about them). If no p_maxResults is
specified, the method returns maximum
self.getNumberOfResultsPerPage(). p_maxResults is ignored if
self.getNumberOfResultsPerPage(). The method returns all objects if
p_maxResults equals string "NO_LIMIT". p_maxResults is ignored if
p_brainsOnly is True.'''
# Is there one or several content types ?
if contentType.find(',') != -1:
@ -164,6 +165,7 @@ class ToolMixin(AbstractMixin):
brains = self.portal_catalog.searchResults(**params)
if brainsOnly: return brains
if not maxResults: maxResults = self.getNumberOfResultsPerPage()
elif maxResults == 'NO_LIMIT': maxResults = None
res = SomeObjects(brains, maxResults, startNumber)
res.brainsToObjects()
# In some cases (p_remember=True), we need to keep some information

View file

@ -197,7 +197,14 @@ class AbstractMixin:
history, for example).'''
# Which value will we use ?
if useParamValue: v = value
else: v = eval('self.%s' % name)
else:
try:
v = eval('self.%s' % name)
except AttributeError:
# Probably a newly created attribute.
# In this case, return the default value.
v = None
if appyType: v = appyType['default']
if not appyType: return v
if (v == None) or (v == ''): return v
vType = appyType['type']

View file

@ -98,7 +98,7 @@
</div>
<div metal:define-macro="showInfoField">
<span class="appyLabel" tal:content="label"></span>
<span class="appyLabel" tal:content="structure label"></span>
<span tal:content="structure description"></span>
</div>

View file

@ -102,6 +102,9 @@ class AbstractWrapper:
key = self.o.workflow_history.keys()[0]
return self.o.workflow_history[key]
history = property(get_history)
def get_user(self):
return self.o.portal_membership.getAuthenticatedMember()
user = property(get_user)
def link(self, fieldName, obj):
'''This method links p_obj to this one through reference field
@ -270,6 +273,10 @@ class AbstractWrapper:
contentType = flavour.o.getPortalType(klass)
# Create the Search object
search = Search('customSearch', sortBy=sortBy, **fields)
if not maxResults:
maxResults = 'NO_LIMIT'
# If I let maxResults=None, only a subset of the results will be
# returned by method executeResult.
res = self.tool.o.executeQuery(contentType,flavour.number,search=search,
maxResults=maxResults)
return [o.appy() for o in res['objects']]