Update of
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation
In directory
james.mmbase.org:/tmp/cvs-serv1370/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation
Modified Files:
LinkTag.java
Log Message:
Merge van 1.4 branch
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation
Index: LinkTag.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/navigation/LinkTag.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- LinkTag.java 28 Jan 2008 21:15:45 -0000 1.17
+++ LinkTag.java 14 Mar 2008 12:52:30 -0000 1.18
@@ -22,6 +22,7 @@
import com.finalist.cmsc.beans.om.*;
import com.finalist.cmsc.navigation.ServerUtil;
+import com.finalist.cmsc.services.search.PageInfo;
import com.finalist.cmsc.services.search.Search;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
import com.finalist.cmsc.taglib.CmscTag;
@@ -240,13 +241,20 @@
private void addPortletParametersToUrl(PortalURL u) {
if (element != null) {
int pageId = page.getId();
- if (window == null) {
- window = Search.getPortletWindow(pageId, element);
+ PageInfo pageInfo = Search.getPortletInformation(pageId, element);
+ if (pageInfo != null) {
+ window = pageInfo.getWindowName();
+ u.setRenderParameter(window, "elementId", new String[] {
element });
+ for (Map.Entry<String, String> urlParam :
pageInfo.getUrlParameters().entrySet()) {
+ u.setRenderParameter(pageInfo.getWindowName(),
urlParam.getKey(), new String[] { urlParam.getValue() } );
+ }
}
+ else {
if (window != null) {
u.setRenderParameter(window, "elementId", new String[] {
element });
}
}
+ }
if (window != null) {
for (Map.Entry<String, Object> paramEntry : params.entrySet()) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
