render description in text part
git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@4020 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
		
							parent
							
								
									5c9cbd1713
								
							
						
					
					
						commit
						cb6908f7c4
					
				
					 3 changed files with 14 additions and 5 deletions
				
			
		|  | @ -397,12 +397,17 @@ class BaseView(GenericView, I18NView): | ||||||
|         view = component.getMultiAdapter((removeAllProxies(source), self.request)) |         view = component.getMultiAdapter((removeAllProxies(source), self.request)) | ||||||
|         return view.render() |         return view.render() | ||||||
| 
 | 
 | ||||||
|  |     def renderDescription(self, text=None): | ||||||
|  |         if text is None: | ||||||
|  |             text = self.description | ||||||
|  |         htmlPattern = re.compile(r'<(.+)>.+</\1>') | ||||||
|  |         if htmlPattern.search(text): | ||||||
|  |             return text | ||||||
|  |         return self.renderText(text, 'text/restructured') | ||||||
|  | 
 | ||||||
|     @Lazy |     @Lazy | ||||||
|     def renderedDescription(self): |     def renderedDescription(self): | ||||||
|         htmlPattern = re.compile(r'<(.+)>.+</\1>') |         return self.renderDescription() | ||||||
|         if htmlPattern.search(self.description): |  | ||||||
|             return self.description |  | ||||||
|         return self.renderText(self.description, 'text/restructured') |  | ||||||
| 
 | 
 | ||||||
|     # type listings |     # type listings | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -50,7 +50,7 @@ | ||||||
|       <metal:image use-macro="item/macros/image" /> |       <metal:image use-macro="item/macros/image" /> | ||||||
|     </div> |     </div> | ||||||
|     <div tal:attributes="class python:part.cssClass[1]"> |     <div tal:attributes="class python:part.cssClass[1]"> | ||||||
|       <span tal:content="cell/textDescription" /> |       <span tal:content="cell/renderTextDescription" /> | ||||||
|     </div> |     </div> | ||||||
|     <tal:break condition="cell/img"> |     <tal:break condition="cell/img"> | ||||||
|       <br style="clear: both" /> </tal:break> |       <br style="clear: both" /> </tal:break> | ||||||
|  |  | ||||||
|  | @ -83,6 +83,10 @@ class ConceptView(BaseConceptView): | ||||||
|         for r in self.resources['texts']: |         for r in self.resources['texts']: | ||||||
|                 return r.description |                 return r.description | ||||||
| 
 | 
 | ||||||
|  |     @Lazy | ||||||
|  |     def renderedTextDescription(self): | ||||||
|  |         return self.renderDescription(self.textDescription) | ||||||
|  | 
 | ||||||
|     @Lazy |     @Lazy | ||||||
|     def targetUrl(self): |     def targetUrl(self): | ||||||
|         return self.nodeView.getUrlForTarget(self.context) |         return self.nodeView.getUrlForTarget(self.context) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 helmutm
						helmutm