cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a few bug fixes and make the tests pass again

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@1342 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2006-09-12 22:34:31 +00:00
parent aa4e337581
commit 2d25015202
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
browser/resource.py
View file

@ -88,10 +88,11 @@ class ResourceView(BaseView):
def __init__(self, context, request): def __init__(self, context, request):
super(ResourceView, self).__init__(context, request) super(ResourceView, self).__init__(context, request)
if not IUnauthenticatedPrincipal.providedBy(self.request.principal): if not IUnauthenticatedPrincipal.providedBy(self.request.principal):
cm = self.controller.macros cont = self.controller
cm.register('portlet_right', 'related', title='Related Items', if cont is not None:
subMacro=self.template.macros['related'], cont.macros.register('portlet_right', 'related', title='Related Items',
position=0, info=self) subMacro=self.template.macros['related'],
position=0, info=self)
def show(self): def show(self):
data = self.context.data data = self.context.data

6
helpers.txt
View file

@ -353,9 +353,13 @@ Now we are ready to set up a view on our page node:
>>> view = NodeView(m1p1, request) >>> view = NodeView(m1p1, request)
The elements responsible for presentation are controlled by a controller The elements responsible for presentation are controlled by a controller
object: object; note that we have to provide a named template 'loops.node_macros' that
is used to retrieve a macro used by NodeView:
>>> from cybertools.browser.controller import Controller >>> from cybertools.browser.controller import Controller
>>> from loops.browser.util import node_macros
>>> from loops.browser.common import BaseView
>>> component.provideAdapter(node_macros, (BaseView,), name='loops.node_macros')
>>> controller = Controller(view, request) >>> controller = Controller(view, request)
>>> getattr(controller, 'skinName', None) is None >>> getattr(controller, 'skinName', None) is None
True True

4
search/browser.py
View file

@ -165,7 +165,9 @@ class SearchResults(BaseView):
cat = self.catalog cat = self.catalog
request = self.request request = self.request
type = request.get('search.3.type', 'loops:concept:*') type = request.get('search.3.type', 'loops:concept:*')
text = request.get('search.3.text').replace('(', ' ').replace(')', ' ') text = request.get('search.3.text')
if text: # there are a few characters that the index doesn't like
text = text.replace('(', ' ').replace(')', ' ')
if not text and '*' in type: if not text and '*' in type:
return None return None
if type.endswith('*'): if type.endswith('*'):