Update of /var/cvs/applications/editwizard/templates/javascript
In directory james.mmbase.org:/tmp/cvs-serv16677/templates/javascript
Modified Files:
newfromlist.jsp searchlist.js
Log Message:
porting some from 1.8
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- newfromlist.jsp 13 Feb 2008 13:21:09 -0000 1.4
+++ newfromlist.jsp 25 Apr 2008 16:55:45 -0000 1.5
@@ -4,7 +4,7 @@
* Routines for NewFromList
*
* @since MMBase-1.9
- * @version $Id: newfromlist.jsp,v 1.4 2008/02/13 13:21:09 pierre Exp $
+ * @version $Id: newfromlist.jsp,v 1.5 2008/04/25 16:55:45 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,8 +71,6 @@
url += setParam("constraints", constraints);
url += setParam("age", searchage+"");
-alert(relationOriginNode);
-
showPopup(url);
}
Index: searchlist.js
===================================================================
RCS file: /var/cvs/applications/editwizard/templates/javascript/searchlist.js,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- searchlist.js 31 May 2007 16:32:23 -0000 1.8
+++ searchlist.js 25 Apr 2008 16:55:45 -0000 1.9
@@ -54,7 +54,6 @@
window.opener.document.forms[0].submit();
window.close();
-
}
function buildSelectedList() {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
