Update of /var/cvs/applications/editwizard/templates/jsp
In directory james.mmbase.org:/tmp/cvs-serv9971
Modified Files:
Tag: MMBase-1_8
unlinklistitem.jsp
Log Message:
when relationOriginNode is empty origin can be the one we've related to
See also: http://cvs.mmbase.org/viewcvs/applications/editwizard/templates/jsp
Index: unlinklistitem.jsp
===================================================================
RCS file: /var/cvs/applications/editwizard/templates/jsp/unlinklistitem.jsp,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- unlinklistitem.jsp 31 May 2007 16:29:50 -0000 1.2.2.2
+++ unlinklistitem.jsp 21 Feb 2008 13:44:49 -0000 1.2.2.3
@@ -1,4 +1,4 @@
-.<%@ include file="settings.jsp"
+<%@ include file="settings.jsp"
%><mm:content type="text/html" expires="0" language="<%=ewconfig.language%>">
<mm:cloud name="mmbase" jspvar="cloud" method="asis"
><%@ page import="org.mmbase.bridge.*,org.mmbase.bridge.util.*"
@@ -11,7 +11,7 @@
<%
/**
* @since MMBase-1.8.4
- * @version $Id: unlinklistitem.jsp,v 1.2.2.2 2007/05/31 16:29:50 michiel
Exp $
+ * @version $Id: unlinklistitem.jsp,v 1.2.2.3 2008/02/21 13:44:49 andre
Exp $
* @author Michiel Meeuwissen
*/
@@ -22,10 +22,12 @@
Wizard wiz = new Wizard(request.getContextPath(), ewconfig.uriResolver,
wizard, null, cloud);
Node unlinkaction = Utils.selectSingleNode(wiz.getSchema(), "/*/[EMAIL
PROTECTED]'unlink']");
String relationOriginNode = (String)
con.getAttributes().get("relationOriginNode");
+ if (relationOriginNode == null) relationOriginNode = (String)
con.getAttributes().get("origin");
String relationRole = (String) con.getAttributes().get("relationRole");
String relationCreateDir = (String)
con.getAttributes().get("relationCreateDir");
if (unlinkaction != null) {
// Ok. let's unlink this object.
+ log.info("objectnumber: " + objectnumber + " relationOriginNode: " +
relationOriginNode);
org.mmbase.bridge.Node n = cloud.getNode(objectnumber);
org.mmbase.bridge.Node origin = cloud.getNode(relationOriginNode);
log.debug("objectnumber " + n.getNumber() + " " + origin.getNumber() +
" " + relationOriginNode);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
