Author: mfang
Date: 2009-05-26 10:17:09 +0200 (Tue, 26 May 2009)
New Revision: 35433
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
Log:
CMSC-1116 advanced search for dynamic form save answer gives 500 error
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-05-26 08:17:08 UTC (rev 35432)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-05-26 08:17:09 UTC (rev 35433)
@@ -20,6 +20,7 @@
<cmscedit:head title="search.title">
<link rel="stylesheet" href="<cmsc:staticurl
page='../css/thumbnail.css'/>" type="text/css">
+ <script src="../../mmbase/edit/wizard/javascript/validator.js"
type="text/javascript"></script>
<script src="../repository/asset.js" language="JavaScript"
type="text/javascript"></script>
<script src="search.js" type="text/javascript"></script>
<script type="text/javascript">
@@ -163,6 +164,7 @@
</td>
<td rowspan="5">
<c:set var="fields"/>
+ <c:set var="fieldtypes"/>
<mm:compare referid="assettypes" value="assetelement"
inverse="true">
<table>
<mm:fieldlist nodetype="${assettypes}">
@@ -185,12 +187,15 @@
<c:choose>
<c:when test="${empty fields}">
<c:set
var="fields">${assettypes}.${fieldname}</c:set>
+ <c:set
var="fieldtypes"><mm:fieldinfo type="typedescription"/></c:set>
</c:when>
<c:otherwise>
<c:set
var="fields">${fields},${assettypes}.${fieldname}</c:set>
+ <c:set
var="fieldtypes">${fieldtypes},<mm:fieldinfo type="typedescription"/></c:set>
</c:otherwise>
</c:choose>
</mm:fieldinfo>
+ </td>
</tr>
</c:if>
</mm:fieldlist>
@@ -200,12 +205,14 @@
<td rowspan="5">
<mm:compare referid="assettypes" value="assetelement"
inverse="true">
<table>
- <c:forTokens items="${fields}" var="field"
delims=",">
+ <c:forTokens items="${fields}" var="field"
delims="," varStatus="status">
+ <c:forTokens items="${fieldtypes}"
var="fieldtype" delims="," begin="${status.index}" end="${status.index}">
<tr>
<td height="32">
- <input type="text" name="${field}"
value="${param.field}" />
+ <input type="text" name="${field}"
dttype="${fieldtype}" value="${param.field}" />
</td>
</tr>
+ </c:forTokens>
</c:forTokens>
</table>
</mm:compare>
@@ -314,7 +321,7 @@
<tr>
<td></td>
<td>
- <input type="submit" class="button"
name="submitButton" onclick="setOffset(0);" value="<fmt:message
key="searchform.submit" />"/>
+ <input type="submit" class="button"
name="submitButton" onclick="return validateInputs();" value="<fmt:message
key="searchform.submit" />"/>
</td>
</tr>
</table>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
