[MMBASE CVS] applications/editwizard/templates/javascript newfromlist.jsp

[Andre van Toly]

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

Modified Files:
      Tag: MMBase-1_8
        newfromlist.jsp 
Log Message:
some fixes, multilevel search was not complete;y correct


See also: 
http://cvs.mmbase.org/viewcvs/applications/editwizard/templates/javascript


Index: newfromlist.jsp
===================================================================
RCS file: 
/var/cvs/applications/editwizard/templates/javascript/newfromlist.jsp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- newfromlist.jsp     13 Feb 2008 13:15:07 -0000      1.1.2.4
+++ newfromlist.jsp     19 Feb 2008 20:16:21 -0000      1.1.2.5
@@ -4,7 +4,7 @@
  * Routines for NewFromList
  * 
  * @since    MMBase-1.9
- * @version  $Id: newfromlist.jsp,v 1.1.2.4 2008/02/13 13:15:07 pierre Exp $
+ * @version  $Id: newfromlist.jsp,v 1.1.2.5 2008/02/19 20:16:21 andre Exp $
  */
 
 function doMySearch(el) {
@@ -41,7 +41,9 @@
             fields += ",";
         }
         var fieldname=cs[i];
-        if (fieldname.indexOf(".")!=-1 && undefined == relationNodepath) 
fieldname = fieldname.substring(fieldname.indexOf(".")+1,fieldname.length);
+        if (fieldname.indexOf(".")!=-1 && relationNodepath.length == 0) {
+            fieldname = 
fieldname.substring(fieldname.indexOf(".")+1,fieldname.length);
+        }
 
         if (searchtype=="like") {
             constraints += "LOWER("+fieldname+") LIKE '%25"+searchterm+"%25'";
@@ -58,7 +60,7 @@
     // build url
     // var url="<%= 
response.encodeURL("list.jsp")%>?proceed=true&popupid=search&replace=true&referrer=<%=java.net.URLEncoder.encode(request.getParameter("referrer"),"UTF-8")%>&template=xsl/newfromlist.xsl&nodepath="+objectType+"&fields="+fields+"&pagelength=10&language=<%=request.getParameter("language")%>&country=<%=request.getParameter("country")%>&timezone=<%=request.getParameter("timezone")%>";
     var url="<%= 
response.encodeURL("list.jsp")%>?proceed=true&popupid=search&replace=true&referrer=<%=java.net.URLEncoder.encode(request.getParameter("referrer"),"UTF-8")%>&template=xsl/newfromlist.xsl&fields="+fields+"&pagelength=10&language=<%=request.getParameter("language")%>&country=<%=request.getParameter("country")%>&timezone=<%=request.getParameter("timezone")%>";
-    if (undefined != relationNodepath) {
+    if (relationNodepath.length != 0) {
         url += "&nodepath=" + relationNodepath + "&startnodes=" + 
relationStartnodes;
     } else {
         url += "&nodepath=" + objectType;
@@ -69,7 +71,9 @@
     url += setParam("constraints", constraints);
     url += setParam("age", searchage+"");
    
-alert(relationOriginNode);
+    console.log("relationOriginNode: " + relationOriginNode + " objType: " + 
objectType);
+    console.log("relationNodepath: " + relationNodepath + " relationRole: " + 
relationRole + " relationCreateDir: " + createDir + " relationStartnodes: " + 
relationStartnodes);
+    console.log("url: " + url);
  
     showPopup(url);
 }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs