[gatein-commits] gatein SVN: r4125 - in portal/branches/navcontroller/web/portal/src/main/webapp: groovy/webui/core and 1 other directory.

[do-not-reply at jboss.org]

Author: trong.tran
Date: 2010-09-09 08:18:22 -0400 (Thu, 09 Sep 2010)
New Revision: 4125

Modified:
   portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml
   portal/branches/navcontroller/web/portal/src/main/webapp/groovy/webui/core/UIBreadcumbs.gtmpl
Log:
Revert a wrong update for Breadcumbs

Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml
===================================================================
--- portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml	2010-09-09 12:08:24 UTC (rev 4124)
+++ portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml	2010-09-09 12:18:22 UTC (rev 4125)
@@ -69,13 +69,6 @@
       <portlet>
         <application-ref>web</application-ref>
         <portlet-ref>BreadcumbsPortlet</portlet-ref>
-        <preferences>
-          <preference>
-            <name>useAJAX</name>
-            <value>false</value>
-            <read-only>false</read-only>
-          </preference>
-        </preferences>
       </portlet>
       <access-permissions>Everyone</access-permissions>
 	    <show-info-bar>false</show-info-bar>

Modified: portal/branches/navcontroller/web/portal/src/main/webapp/groovy/webui/core/UIBreadcumbs.gtmpl
===================================================================
--- portal/branches/navcontroller/web/portal/src/main/webapp/groovy/webui/core/UIBreadcumbs.gtmpl	2010-09-09 12:08:24 UTC (rev 4124)
+++ portal/branches/navcontroller/web/portal/src/main/webapp/groovy/webui/core/UIBreadcumbs.gtmpl	2010-09-09 12:18:22 UTC (rev 4125)
@@ -3,8 +3,6 @@
 	import org.exoplatform.portal.webui.util.Util;
 	import org.exoplatform.portal.application.PortalRequestContext;
 	import org.gatein.common.text.EntityEncoder;
-  import org.exoplatform.web.url.ResourceURL;
-  import org.exoplatform.web.application.Parameter;  
  
 	List list = uicomponent.getPath();
 	def styleBread = uicomponent.getBreadcumbsStyle();
@@ -13,8 +11,6 @@
 	def String portalURI = pcontext.getPortalURI();
 		
 	def useAJAX = uicomponent.isUseAjax();
-  
-	ResourceURL nodeURL = pcontext.createURL(org.exoplatform.portal.url.navigation.NavigationLocator.TYPE);
 %>
 
 <div class="UIBreadcumbs">
@@ -28,12 +24,9 @@
 							localPath = list.get(i);							
 							String actionLink 
 							if(useAJAX)
-							{
-							  nodeURL.setParameters(new Parameter(PortalRequestContext.TARGET_NODE, localPath.getId()));
-							  actionLink = nodeURL.setAjax(true).toString();
-							} else {
-								actionLink = portalURI + localPath.getId();
-							}
+								actionLink = uicomponent.event("SelectPath", localPath.getId());
+							else
+								actionLink = portalURI + localPath.getId();	
 							EntityEncoder entityEncoder = EntityEncoder.FULL;
 							String label = entityEncoder.encode(localPath.label) 
 							if(i == list.size()-1) note = "Selected";