Author: kevinshen
Date: 2009-06-29 04:28:31 +0200 (Mon, 29 Jun 2009)
New Revision: 36446
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp
Log:
CMSC-1455 The searching conditions are lost when linking an asset element.
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp
2009-06-29 02:04:27 UTC (rev 36445)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp
2009-06-29 02:28:31 UTC (rev 36446)
@@ -9,8 +9,11 @@
<script src="../resources/assetsearch.js" type="text/javascript"></script>
<script type="text/javascript">
function setDefaultSearchCondition(){
+ <c:if test="${not empty title}">
document.forms[0].title.value = "${title}";
+ </c:if><c:if test="${not empty description}">
document.forms[0].description.value = "${description}";
+ </c:if>
}
function showInfo(objectnumber) {
openPopupWindow('attachmentinfo', '900', '500',
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp
2009-06-29 02:04:27 UTC (rev 36445)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp
2009-06-29 02:28:31 UTC (rev 36446)
@@ -9,8 +9,11 @@
<script src="../resources/assetsearch.js" type="text/javascript"></script>
<script type="text/javascript">
function setDefaultSearchCondition(){
- document.forms[0].title.value = "${title}";
- document.forms[0].description.value = "${description}";
+ <c:if test="${not empty title}">
+ document.forms[0].title.value = "${title}";
+ </c:if><c:if test="${not empty description}">
+ document.forms[0].description.value = "${description}";
+ </c:if>
}
function showInfo(objectnumber) {
openPopupWindow('imageinfo', '900', '500',
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp
2009-06-29 02:04:27 UTC (rev 36445)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp
2009-06-29 02:28:31 UTC (rev 36446)
@@ -9,9 +9,13 @@
<script src="../resources/assetsearch.js" type="text/javascript"></script>
<script type="text/javascript">
function setDefaultSearchCondition(){
- document.forms[0].title.value = "${title}";
- document.forms[0].description.value = "${description}";
+ <c:if test="${not empty title}">
+ document.forms[0].title.value = "${title}";
+ </c:if><c:if test="${not empty description}">
+ document.forms[0].description.value = "${description}";
+ </c:if><c:if test="${not empty url}">
document.forms[0].url.value = "${url}";
+ </c:if>
}
function showInfo(objectnumber) {
openPopupWindow('urlinfo', '900', '500',
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
