rattail/appypod-rattail
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[gen] Minor updates.

Browse source
This commit is contained in:
Gaetan Delannay 2013-04-09 10:57:21 +02:00
parent 2869d0382f
commit 1d2a19a1c6
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gen/mixins/ToolMixin.py
View file

@ -288,7 +288,14 @@ class ToolMixin(BaseMixin):
'''Gets, for the currently logged user, the value for index '''Gets, for the currently logged user, the value for index
"Allowed".''' "Allowed".'''
user = self.getUser() user = self.getUser()
res = ['user:%s' % user.getId(), 'Anonymous'] + user.getRoles() # Get the user roles
res = user.getRoles()
# Add role "Anonymous"
if 'Anonymous' not in res: res.append('Anonymous')
# Add the user id if not anonymous
userId = user.getId()
if userId: res.append('user:%s' % userId)
# Add group ids
try: try:
res += ['user:%s' % g for g in user.groups.keys()] res += ['user:%s' % g for g in user.groups.keys()]
except AttributeError, ae: except AttributeError, ae:
@ -602,9 +609,9 @@ class ToolMixin(BaseMixin):
transformMethods = {'uppercase': 'upper', 'lowercase': 'lower', transformMethods = {'uppercase': 'upper', 'lowercase': 'lower',
'capitalize': 'capitalize'} 'capitalize': 'capitalize'}
def onSearchObjects(self): def storeSearchCriteria(self):
'''This method is called when the user triggers a search from '''Stores the search criteria coming from the request into the
search.pt.''' session.'''
rq = self.REQUEST rq = self.REQUEST
# Store the search criteria in the session # Store the search criteria in the session
criteria = self._getDefaultSearchCriteria() criteria = self._getDefaultSearchCriteria()
@ -665,6 +672,12 @@ class ToolMixin(BaseMixin):
refInfo = rq.get('ref', None) refInfo = rq.get('ref', None)
if refInfo: criteria['_ref'] = refInfo if refInfo: criteria['_ref'] = refInfo
rq.SESSION['searchCriteria'] = criteria rq.SESSION['searchCriteria'] = criteria
def onSearchObjects(self):
'''This method is called when the user triggers a search from
search.pt.'''
rq = self.REQUEST
self.storeSearchCriteria()
# Go to the screen that displays search results # Go to the screen that displays search results
backUrl = '%s/ui/query?className=%s&&search=customSearch' % \ backUrl = '%s/ui/query?className=%s&&search=customSearch' % \
(self.absolute_url(), rq['className']) (self.absolute_url(), rq['className'])

7
gen/ui/result.pt
View file

@ -109,7 +109,8 @@
navBaseCall python: 'askQueryResult(\'%s\',\'%s\',\'%s\',\'%s\',**v**)' % (ajaxHookId, tool.absolute_url(), className, searchName); navBaseCall python: 'askQueryResult(\'%s\',\'%s\',\'%s\',\'%s\',**v**)' % (ajaxHookId, tool.absolute_url(), className, searchName);
newSearchUrl python: '%s/ui/search?className=%s%s' % (tool.absolute_url(), className, refUrlPart); newSearchUrl python: '%s/ui/search?className=%s%s' % (tool.absolute_url(), className, refUrlPart);
showSubTitles python: request.get('showSubTitles', 'true') == 'true'; showSubTitles python: request.get('showSubTitles', 'true') == 'true';
resultMode python: tool.getResultMode(className)"> resultMode python: tool.getResultMode(className);
showNewSearch showNewSearch|python:True">
<tal:result condition="objs"> <tal:result condition="objs">
<tal:comment replace="nothing">Display here POD templates if required.</tal:comment> <tal:comment replace="nothing">Display here POD templates if required.</tal:comment>
@ -128,7 +129,7 @@
<p> <p>
<span tal:replace="searchDescr/translated"/> <span tal:replace="searchDescr/translated"/>
(<span tal:replace="totalNumber"/>) (<span tal:replace="totalNumber"/>)
<tal:newSearch condition="python: searchName == 'customSearch'"> <tal:newSearch condition="python: showNewSearch and (searchName == 'customSearch')">
&nbsp;&mdash;&nbsp;<i><a tal:attributes="href newSearchUrl" &nbsp;&mdash;&nbsp;<i><a tal:attributes="href newSearchUrl"
tal:content="python: _('search_new')"></a></i> tal:content="python: _('search_new')"></a></i>
</tal:newSearch> </tal:newSearch>
@ -164,7 +165,7 @@
<tal:noResult condition="not: objs"> <tal:noResult condition="not: objs">
<span tal:replace="python: _('query_no_result')"/> <span tal:replace="python: _('query_no_result')"/>
<tal:newSearch condition="python: searchName == 'customSearch'"> <tal:newSearch condition="python: showNewSearch and (searchName == 'customSearch')">
<br/><i class="discreet"><a tal:attributes="href newSearchUrl" <br/><i class="discreet"><a tal:attributes="href newSearchUrl"
tal:content="python: _('search_new')"></a></i> tal:content="python: _('search_new')"></a></i>
</tal:newSearch> </tal:newSearch>