portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r886901 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
Date Thu, 03 Dec 2009 20:15:39 GMT
Author: taylor
Date: Thu Dec  3 20:15:39 2009
New Revision: 886901

URL: http://svn.apache.org/viewvc?rev=886901&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1084
-  fixing /portal pipeline

Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm?rev=886901&r1=886900&r2=886901&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.vm
Thu Dec  3 20:15:39 2009
@@ -310,6 +310,7 @@
 	     
 	  #foreach($f in $column)
       ## Set up coordinates for this fragment
+      #if($f.isLocked() == false)
       #set($coords = $columnLayout.getCoordinate($f))	  
       #set($col = $coords.x)
       #set($lastRow = $columnLayout.getLastRowNumber($col))
@@ -381,6 +382,7 @@
 			    $f.renderedContent			
 		    #end
 		  </div>
+		  #end
 		#end
 	</div>
 	#set ($columnIndex = $columnIndex + 1)  

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java?rev=886901&r1=886900&r2=886901&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
Thu Dec  3 20:15:39 2009
@@ -104,8 +104,7 @@
                 }
             }
         }        
-        if (!f.isLocked()) // FIXME: this is still not the desired behavior, need to check
if its docked 
-            renderer.renderNow(f, context);
+        renderer.renderNow(f, context);
     }
     
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message