Author: fpunt
Date: 2010-01-22 14:18:21 +0100 (Fri, 22 Jan 2010)
New Revision: 40694
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
Log:
CMSC-1627 Content type was hardcoded in contentsearch.jsp
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-01-22 13:08:26 UTC (rev 40693)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-01-22 13:18:21 UTC (rev 40694)
@@ -137,7 +137,7 @@
<td nowrap>
<c:if test="${not empty onlytype}" >
<html:hidden property="contenttypes" />
- <input type="hidden" style="width:145px"
value="${onlytype}" name="onlytype" />Article
+ <input type="hidden" style="width:145px"
value="${onlytype}" name="onlytype" />
<c:choose>
<c:when test="${onlytype !=
'contentelement'}">
<%=CloudProviderFactory.getCloudProvider().getCloud().getNodeManager((String)request.getAttribute("onlytype")).getGUIName(NodeManager.GUI_SINGULAR,
request.getLocale())%>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-01-22 13:08:26 UTC (rev 40693)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-01-22 13:18:21 UTC (rev 40694)
@@ -5,6 +5,7 @@
com.finalist.cmsc.repository.RepositoryUtil"
%><%@ page import="com.finalist.cmsc.security.UserRole"
%><%@ page import="com.finalist.cmsc.security.SecurityUtil"
+%><%@ page import="net.sf.mmapps.modules.cloudprovider.CloudProviderFactory"
%><mm:content type="text/html" encoding="UTF-8" expires="0">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html:html xhtml="true">
@@ -136,7 +137,15 @@
<td nowrap>
<c:if test="${not empty onlytype}" >
<html:hidden property="contenttypes" />
- <input type="hidden" style="width:145px"
value="${onlytype}" name="onlytype" />Article
+ <input type="hidden" style="width:145px"
value="${onlytype}" name="onlytype" />
+ <c:choose>
+ <c:when test="${onlytype !=
'contentelement'}">
+
<%=CloudProviderFactory.getCloudProvider().getCloud().getNodeManager((String)request.getAttribute("onlytype")).getGUIName(NodeManager.GUI_SINGULAR,
request.getLocale())%>
+ </c:when>
+ <c:otherwise>
+ <fmt:message
key="searchform.contenttypes.all" />
+ </c:otherwise>
+ </c:choose>
</c:if>
<c:if test="${empty onlytype}" >
<html:select style="width:145px"
property="contenttypes" onchange="selectContenttype('${searchinit}');" >
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
