[MMBASE CVS] applications/editwizard/templates/jsp list.jsp unlinklistitem.jsp

[Pierre van Rooden]

Update of /var/cvs/applications/editwizard/templates/jsp
In directory james.mmbase.org:/tmp/cvs-serv20015/templates/jsp

Modified Files:
        list.jsp unlinklistitem.jsp 
Log Message:
MMB-1793


See also: http://cvs.mmbase.org/viewcvs/applications/editwizard/templates/jsp
See also: http://www.mmbase.org/jira/browse/MMB-1793


Index: list.jsp
===================================================================
RCS file: /var/cvs/applications/editwizard/templates/jsp/list.jsp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- list.jsp    1 Aug 2008 16:39:30 -0000       1.76
+++ list.jsp    13 Mar 2009 15:14:32 -0000      1.77
@@ -5,7 +5,7 @@
      * list.jsp
      *
      * @since    MMBase-1.6
-     * @version  $Id: list.jsp,v 1.76 2008/08/01 16:39:30 michiel Exp $
+     * @version  $Id: list.jsp,v 1.77 2009/03/13 15:14:32 pierre Exp $
      * @author   Kars Veling
      * @author   Michiel Meeuwissen
      * @author   Pierre van Rooden
@@ -200,9 +200,12 @@
 if (!manager.mayCreateNode()) creatable=false;
 
 // relationmanager test for searchlists
-String roleStr = request.getParameter("relationRole");
-String originNodeNr = request.getParameter("relationOriginNode");
-String createDir  = request.getParameter("relationCreateDir");
+String roleStr =(String) listConfig.getAttributes().get("relationRole");
+String originNodeNr = (String) 
listConfig.getAttributes().get("relationOriginNode");
+String createDir  = (String) 
listConfig.getAttributes().get("relationCreateDir");
+if ( originNodeNr == null || "".equals(originNodeNr)) {
+   originNodeNr = (String) listConfig.getAttributes().get("origin");
+}
 boolean checkRelationRights = originNodeNr != null && !"".equals(originNodeNr) 
&& roleStr != null && !"".equals(roleStr);
 Node originNode = null;
 RelationManager relationManager = null;


Index: unlinklistitem.jsp
===================================================================
RCS file: /var/cvs/applications/editwizard/templates/jsp/unlinklistitem.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- unlinklistitem.jsp  1 Aug 2008 16:40:13 -0000       1.5
+++ unlinklistitem.jsp  13 Mar 2009 15:14:32 -0000      1.6
@@ -11,7 +11,7 @@
 <%
     /**
      * @since    MMBase-1.8.4
-     * @version  $Id: unlinklistitem.jsp,v 1.5 2008/08/01 16:40:13 michiel Exp 
$
+     * @version  $Id: unlinklistitem.jsp,v 1.6 2009/03/13 15:14:32 pierre Exp $
      * @author   Michiel Meeuwissen
      */
 
@@ -42,9 +42,8 @@
 
         
response.sendRedirect(response.encodeRedirectURL("list.jsp?proceed=true&sessionkey="
 + sessionKey));
     } else {
-        // No delete action defined in the wizard schema. We cannot delete.
-        out.println("No delete action is defined in the wizard schema: '"+ 
wizard + "'. <br />You should place &lt;action type=\"delete\" /> in your 
schema so that delete actions will be allowed.");
-
+        // No unlink action defined in the wizard schema. We cannot unlink.
+        out.println("No unlink action is defined in the wizard schema: '"+ 
wizard + "'. <br />You should place &lt;action type=\"unlink\" /> in your 
schema so that unlink actions will be allowed.");
     }
 %>
 </mm:log>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs