Author: billyxie
Date: 2009-08-28 05:23:21 +0200 (Fri, 28 Aug 2009)
New Revision: 38208
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/content.jsp
Log:
CMSC-1182 - Possible to relate a content element to itself
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
2009-08-27 20:27:09 UTC (rev 38207)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
2009-08-28 03:23:21 UTC (rev 38208)
@@ -1,6 +1,7 @@
package com.finalist.cmsc.repository.forms;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -10,7 +11,8 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.LabelValueBean;
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.NodeManager;
import org.mmbase.storage.search.SortOrder;
import com.finalist.cmsc.repository.ContentElementUtil;
@@ -24,6 +26,7 @@
private static final String PORTLET_ID = "portletId";
private static final String POSITION = "position";
private static final String ONLYTYPE = "onlytype";
+ private static final String RELATIONORIGINNODE = "relationOriginNode";
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
@@ -71,6 +74,9 @@
addToRequest(request, TITLE, searchForm.getTitle());
addToRequest(request, ONLYTYPE, onlytype);
+ String originNodeId = request.getParameter(RELATIONORIGINNODE);
+ request.getSession().setAttribute(RELATIONORIGINNODE, originNodeId);
+
return mapping.findForward(SEARCHOPTIONS);
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-08-27 20:27:09 UTC (rev 38207)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-08-28 03:23:21 UTC (rev 38208)
@@ -491,9 +491,12 @@
'<cmsc:staticurl page="/content/"
/><mm:field name="number"/>',null,null,null,'${position}')
}
</script>
-
- <a href="#" onClick="link<mm:field name="number" />();">
- <img src="../gfx/icons/link.png" title="<fmt:message
key="searchform.icon.select.title" />" /></a>
+ <mm:field jspvar="elementId" name="number">
+ <c:if test='${sessionScope.relationOriginNode !=
elementId}'>
+ <a href="#" onClick="link<mm:field name="number"
/>();">
+ <img src="../gfx/icons/link.png"
title="<fmt:message key="searchform.icon.select.title" />" /></a>
+ </c:if>
+ </mm:field>
</mm:compare>
<mm:compare referid="action" value="selectforwizard">
<a href="#" onClick="top.opener.selectContent('<mm:field
name="number" />', '', ''); top.close();">
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/content.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/content.jsp
2009-08-27 20:27:09 UTC (rev 38207)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/content.jsp
2009-08-28 03:23:21 UTC (rev 38208)
@@ -94,7 +94,11 @@
<td nowrap>
<a href="javascript:info('<mm:field name="number" />')"><img
src="../../gfx/icons/info.png" width="16" height="16" alt="<fmt:message
key="content.info" />"/></a>
<mm:import id="url">javascript:selectElement('<mm:field
name="number"/>', '<mm:field name="title" escape="js-single-quotes"/>',
'<cmsc:staticurl page="/content/" /><mm:field name="number"/>');</mm:import>
- <a href="<mm:write referid="url"/>"><img
src="../../gfx/icons/link.png" width="16" height="16" alt="<fmt:message
key="content.link" />"/></a>
+ <mm:field jspvar="elementId" name="number">
+ <c:if test='${sessionScope.relationOriginNode != elementId}'>
+ <a href="<mm:write referid="url"/>"><img
src="../../gfx/icons/link.png" width="16" height="16" alt="<fmt:message
key="content.link" />"/></a>
+ </c:if>
+ </mm:field>
</td>
<td width="100%">
<mm:field name="title"/>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
