Changeset 1072

Timestamp:

25.06.2010 23:28:14 (20 months ago)

Author:

zmsdev

Message:

Revised getTeaserElements and ZMSNote newline_to_br.

File:

• ZMS/trunk/import/zms.metaobj.xml (modified) (2 diffs)

ZMS/trunk/import/zms.metaobj.xml

@@ -2002 +2002 @@
 
 <div class="note">
- <div id="<dtml-var id>" contentEditable="true" onkeyup="onKeyUpZMSNoteDiv(this)"><dtml-var "getText(REQUEST)"></div>
+ <div id="<dtml-var id>" contentEditable="true" onkeyup="onKeyUpZMSNoteDiv(this)"><dtml-var "getText(REQUEST)" newline_to_br></div>
 </div>
 
@@ -3650 +3650 @@
 obs = context.breadcrumbs_obj_path(portalMaster=False)
 obs.reverse()
+this = context.getSelf()
 for ob in obs:
-  abort_penetrance = ob.meta_type == 'ZMSLinkElement' or ob.getObjProperty('attr_zmsteasercontainer_abort_penetrance',request) not in ['',0]
+  abort_penetrance = (ob != this and ob.meta_type == 'ZMSLinkElement') or ob.getObjProperty('attr_zmsteasercontainer_abort_penetrance',request) not in ['',0]
   if abort_penetrance:
     break