From cb6908f7c49cbe34f406c8a04b569f68d5642a4e Mon Sep 17 00:00:00 2001 From: helmutm Date: Mon, 27 Sep 2010 13:13:43 +0000 Subject: [PATCH] render description in text part git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@4020 fd906abe-77d9-0310-91a1-e0d9ade77398 --- browser/common.py | 13 +++++++++---- browser/lobo/standard.pt | 2 +- browser/lobo/standard.py | 4 ++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/browser/common.py b/browser/common.py index dcc964d..8a0768a 100644 --- a/browser/common.py +++ b/browser/common.py @@ -397,12 +397,17 @@ class BaseView(GenericView, I18NView): view = component.getMultiAdapter((removeAllProxies(source), self.request)) return view.render() + def renderDescription(self, text=None): + if text is None: + text = self.description + htmlPattern = re.compile(r'<(.+)>.+') + if htmlPattern.search(text): + return text + return self.renderText(text, 'text/restructured') + @Lazy def renderedDescription(self): - htmlPattern = re.compile(r'<(.+)>.+') - if htmlPattern.search(self.description): - return self.description - return self.renderText(self.description, 'text/restructured') + return self.renderDescription() # type listings diff --git a/browser/lobo/standard.pt b/browser/lobo/standard.pt index 0eb34d6..1e99bcb 100644 --- a/browser/lobo/standard.pt +++ b/browser/lobo/standard.pt @@ -50,7 +50,7 @@
- +

 
diff --git a/browser/lobo/standard.py b/browser/lobo/standard.py index 49cf33d..0e053ef 100644 --- a/browser/lobo/standard.py +++ b/browser/lobo/standard.py @@ -83,6 +83,10 @@ class ConceptView(BaseConceptView): for r in self.resources['texts']: return r.description + @Lazy + def renderedTextDescription(self): + return self.renderDescription(self.textDescription) + @Lazy def targetUrl(self): return self.nodeView.getUrlForTarget(self.context)