[Products.SilvaFind][Sylvain Viollon] Compatibility fixes with v...
[email protected] Tue, 27 Aug 2013 18:18:08 +0200
| Newsgroups | gmane.comp.web.zope.silva.cvs |
|---|---|
| Message-ID | <[email protected]> |
author: Sylvain Viollon
date: Tue Aug 27 18:18:03 2013 +0200
revision: 543:549bae08e8bc in Products.SilvaFind
branch: 1.4
details: https://hg.infrae.com/Products.SilvaFind?cmd=changeset;node=549bae08e8bc
modified: Products/SilvaFind/results/widgets.py
added:
removed:
log: Compatibility fixes with versioned objects.
diffstat:
Products/SilvaFind/results/widgets.py | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diffs (38 lines):
diff -r a6ccb418ca17 -r 549bae08e8bc Products/SilvaFind/results/widgets.py
--- a/Products/SilvaFind/results/widgets.py Fri May 24 12:39:15 2013 +0200
+++ b/Products/SilvaFind/results/widgets.py Tue Aug 27 18:18:03 2013 +0200
@@ -16,7 +16,6 @@
from five import grok
from silva.core.interfaces import IVersion, IImage
from silva.core.interfaces.adapters import IIconResolver
-from silva.core.views.interfaces import IVirtualSite
from zope.component import getMultiAdapter, getUtility
from zope.interface import Interface
from zope.traversing.browser import absoluteURL
@@ -61,7 +60,7 @@
def render(self, item):
content = item.getObject()
if IVersion.providedBy(content):
- content = content.get_content()
+ content = content.get_silva_object()
return self.get_icon(content)
@@ -133,7 +132,7 @@
content = item.getObject()
title = content.get_title_or_id()
if IVersion.providedBy(content):
- url = absoluteURL(content.get_content(), self.request)
+ url = absoluteURL(content.get_silva_object(), self.request)
else:
url = absoluteURL(content, self.request)
ellipsis = '…'
@@ -200,7 +199,7 @@
# since fulltext always starts with id and title, lets remove that
idstring = content.id
if IVersion.providedBy(content):
- idstring = content.get_content().id
+ idstring = content.get_silva_object().id
skipwords = len(('%s %s' % (idstring, content.get_title())).split(' '))
fulltext = fulltext[skipwords:]
fulltextstr = ' '.join(fulltext)