[gen] Allow for ajax-based master-slave relationships within the search screen for Ref fields.
This commit is contained in:
parent
584e38abef
commit
6d6c842f12
16 changed files with 79 additions and 88 deletions
|
@ -648,6 +648,8 @@ class ToolMixin(BaseMixin):
|
|||
for attrName in rq.form.keys():
|
||||
if attrName.startswith('w_') and \
|
||||
not self._searchValueIsEmpty(attrName):
|
||||
field = self.getAppyType(attrName[2:], rq.form['className'])
|
||||
if not field.persist: continue
|
||||
# We have a(n interval of) value(s) that is not empty for a
|
||||
# given field.
|
||||
attrValue = rq.form[attrName]
|
||||
|
@ -1384,18 +1386,6 @@ class ToolMixin(BaseMixin):
|
|||
res = self.goto(siteUrl, self.translate('wrong_password_reinit'))
|
||||
return res
|
||||
|
||||
def getSearchValues(self, name, className):
|
||||
'''Gets the possible values for selecting a value for searching field
|
||||
p_name belonging to class p_className.'''
|
||||
klass = self.getAppyClass(className, wrapper=True)
|
||||
method = getattr(klass, name).searchSelect
|
||||
tool = self.appy()
|
||||
if method.__class__.__name__ == 'function':
|
||||
objects = method(tool)
|
||||
else:
|
||||
objects = method.__get__(tool)(tool)
|
||||
return [(o.uid, o) for o in objects]
|
||||
|
||||
def getGoogleAnalyticsCode(self):
|
||||
'''If the config defined a Google Analytics ID, this method returns the
|
||||
Javascript code to be included in every page, allowing Google
|
||||
|
|
|
@ -690,6 +690,7 @@ class BaseMixin:
|
|||
'''Returns the database value of field named p_name for p_self.
|
||||
If p_onlyIfSync is True, it returns the value only if appyType can be
|
||||
retrieved in synchronous mode.'''
|
||||
if layoutType == 'search': return # No object in search screens.
|
||||
field = self.getAppyType(name)
|
||||
if not onlyIfSync or (onlyIfSync and field.sync[layoutType]):
|
||||
# We must really get the field value.
|
||||
|
@ -699,11 +700,6 @@ class BaseMixin:
|
|||
listType = self.getAppyType(listName)
|
||||
return listType.getInnerValue(self, outerValue, name, int(i))
|
||||
|
||||
def getFormattedFieldValue(self, name, value, showChanges=False):
|
||||
'''Gets a nice, string representation of p_value which is a value from
|
||||
field named p_name.'''
|
||||
return self.getAppyType(name).getFormattedValue(self,value,showChanges)
|
||||
|
||||
def getRequestFieldValue(self, name):
|
||||
'''Gets the value of field p_name as may be present in the request.'''
|
||||
# Return the request value for standard fields.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue