Update of /var/cvs/applications/editwizard/templates/javascript
In directory james.mmbase.org:/tmp/cvs-serv31190/javascript
Modified Files:
Tag: MMBase-1_8
newfromlist.jsp validator.js
Log Message:
support alternate way to enter day values (with a text box instead of dropdown)
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.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- newfromlist.jsp 13 Feb 2008 08:41:19 -0000 1.1.2.3
+++ newfromlist.jsp 13 Feb 2008 13:15:07 -0000 1.1.2.4
@@ -4,7 +4,7 @@
* Routines for NewFromList
*
* @since MMBase-1.9
- * @version $Id: newfromlist.jsp,v 1.1.2.3 2008/02/13 08:41:19 andre Exp $
+ * @version $Id: newfromlist.jsp,v 1.1.2.4 2008/02/13 13:15:07 pierre Exp $
*/
function doMySearch(el) {
@@ -29,6 +29,9 @@
var createDir = "<%=request.getParameter("relationCreateDir")%>";
var objectType = "<%=request.getParameter("objecttype")%>";
+ var relationStartnodes = "<%= request.getParameter("relationStartnodes")
%>";
+ var relationNodepath = "<%= request.getParameter("relationNodepath") %>";
+
var fields = "";
var cs = searchfields.split(",");
var constraints = "(";
@@ -38,7 +41,7 @@
fields += ",";
}
var fieldname=cs[i];
- if (fieldname.indexOf(".")!=-1 ) fieldname =
fieldname.substring(fieldname.indexOf(".")+1,fieldname.length);
+ if (fieldname.indexOf(".")!=-1 && undefined == relationNodepath)
fieldname = fieldname.substring(fieldname.indexOf(".")+1,fieldname.length);
if (searchtype=="like") {
constraints += "LOWER("+fieldname+") LIKE '%25"+searchterm+"%25'";
@@ -53,13 +56,21 @@
// 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&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) {
+ url += "&nodepath=" + relationNodepath + "&startnodes=" +
relationStartnodes;
+ } else {
+ url += "&nodepath=" + objectType;
+ }
url += setParam("relationOriginNode", relationOriginNode);
url += setParam("relationRole", relationRole);
url += setParam("relationCreateDir", createDir);
url += setParam("constraints", constraints);
url += setParam("age", searchage+"");
+alert(relationOriginNode);
+
showPopup(url);
}
Index: validator.js
===================================================================
RCS file: /var/cvs/applications/editwizard/templates/javascript/validator.js,v
retrieving revision 1.37.2.5
retrieving revision 1.37.2.6
diff -u -b -r1.37.2.5 -r1.37.2.6
--- validator.js 27 Nov 2007 12:18:32 -0000 1.37.2.5
+++ validator.js 13 Feb 2008 13:15:07 -0000 1.37.2.6
@@ -3,7 +3,7 @@
* Routines for validating the edit wizard form
*
* @since MMBase-1.6
- * @version $Id: validator.js,v 1.37.2.5 2007/11/27 12:18:32 michiel Exp $
+ * @version $Id: validator.js,v 1.37.2.6 2008/02/13 13:15:07 pierre Exp $
* @author Kars Veling
* @author Pierre van Rooden
* @author Michiel Meeuwissen
@@ -216,7 +216,8 @@
"value is required; please select a value");
}
- } else {
+ }
+ else {
if (isEmpty(v)) {
err += getToolTipValue(form,'message_required',
"value is required");
@@ -418,6 +419,9 @@
if ((ftype == "datetime") || (ftype == "date")) {
month = form.elements["internal_" + id + "_month"].selectedIndex;
day = form.elements["internal_" + id + "_day"].selectedIndex+1;
+ if (isNaN(day)) {
+ day = form.elements["internal_" + id + "_day"].value;
+ }
year = form.elements["internal_" + id + "_year"].value;
}
if ((ftype == "datetime") || (ftype == "time")) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
