[MMBASE SCM] r41637 - speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal

[michiel]

Author: michiel
Date: 2010-03-26 17:23:00 +0100 (Fri, 26 Mar 2010)
New Revision: 41637

Modified:
   
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx
Log:


Modified: 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx
===================================================================
--- 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx
 2010-03-26 15:58:29 UTC (rev 41636)
+++ 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx
 2010-03-26 16:23:00 UTC (rev 41637)
@@ -10,21 +10,26 @@
 
   <jsp:directive.attribute name="flushparam"        type="java.lang.String"  />
   <jsp:directive.attribute name="group"        type="java.lang.String"  
required="true" />
+  <jsp:directive.attribute name="block"        type="org.mmbase.bridge.Node"  
required="true" />
+  <jsp:directive.attribute name="blockposrel"        
type="org.mmbase.bridge.Node"  required="true" />
   <os:cache
-      refreshpolicyclass="${block.refreshpolicy}"
-      refreshpolicyparam="${block.refreshpolicyparam}"
-      refresh="${param.flush eq blockposrel.number}"
+      refreshpolicyclass="${empty block.refreshpolicy ? 
'org.mmbase.portal.refresh.Expires' : block.refreshpolicy}"
+      refreshpolicyparam="${empty block.refreshpolicy and empty 
block.refreshpolicyparam ? '3600' : block.refreshpolicyparam}"
+      refresh="${param[flushparam] eq blockposrel.number}"
       scope="application"
       key="${group}/${blockposrel}"
       groups="${group}"
       >
     <c:catch var="e">
+      <jsp:text>&lt;!--</jsp:text><mm:time time="now" 
/>:${group}/${blockposrel} <jsp:text>--&gt;</jsp:text>
       <jsp:doBody />
     </c:catch>
     <c:if test="${! empty e}">
       <mm:log>${e}</mm:log>
-      <div class="error"><mm:write value="${e}" /></div>
       <os:usecached />
     </c:if>
   </os:cache>
+  <c:if test="${! empty e}">
+    <div class="error"><mm:write value="${e}" /></div>
+  </c:if>
 </jsp:root>

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs