Author: fpunt
Date: 2010-05-18 10:04:42 +0200 (Tue, 18 May 2010)
New Revision: 42207
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
Log:
NFK-337
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2010-05-17 15:08:09 UTC (rev 42206)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2010-05-18 08:04:42 UTC (rev 42207)
@@ -1,4 +1,4 @@
-<%...@page language="java" contentType="text/html;charset=utf-8"
+<%...@page language="java" contentType="text/html;charset=utf-8"
%><%...@include file="globals.jsp"
%><%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit"
%><%...@page import="com.finalist.cmsc.repository.AssetElementUtil,
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-05-17 15:08:09 UTC (rev 42206)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-05-18 08:04:42 UTC (rev 42207)
@@ -146,8 +146,12 @@
<html:hidden property="contenttypes" />
<input type="hidden" style="width:145px"
value="${onlytype}" name="onlytype" />
<c:choose>
+
<c:when test="${!empty param.overrideTypeName}">
+
${param.overrideTypeName}
+
<input name="overrideTypeName" value="${param.overrideTypeName}"
type="hidden"/>
+
</c:when>
<c:when test="${onlytype !=
'contentelement'}">
-
<%=CloudProviderFactory.getCloudProvider().getCloud().getNodeManager((String)request.getAttribute("onlytype")).getGUIName(NodeManager.GUI_SINGULAR,
request.getLocale())%>
+
<%=cloud.getNodeManager((String)request.getAttribute("onlytype")).getGUIName()%>
</c:when>
<c:otherwise>
<fmt:message
key="searchform.contenttypes.all" />
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
2010-05-17 15:08:09 UTC (rev 42206)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
2010-05-18 08:04:42 UTC (rev 42207)
@@ -50,6 +50,7 @@
<mm:param name="contenttypes" value="${type}" />
<mm:param name="onlytype" value="${type}" />
<mm:param name="relationOriginNode"
value="${relationOriginNode}" />
+ <mm:param name="overrideTypeName"
value="${param.overrideTypeName}" />
</mm:url>
</mm:present>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
