Author: billyxie
Date: 2009-05-20 08:02:08 +0200 (Wed, 20 May 2009)
New Revision: 35313
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/definitiondisplay.jsp
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/selectchannel.jsp
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/selectelement.jsp
Log:
CMSC-145 - Default to correct content-type when selecting content-element
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-05-19 17:52:26 UTC (rev 35312)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-05-20 06:02:08 UTC (rev 35313)
@@ -158,7 +158,7 @@
search.trash=Recycle bin
searchform.contenttype=Content type:
-searchform.contenttypes.all=all types
+searchform.contenttypes.all=all allowed contenttypes
searchform.creationdate=Creation date:
searchform.expiredate=Expire date:
searchform.lastmodifieddate=Last modified date:
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-05-19 17:52:26 UTC (rev 35312)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-05-20 06:02:08 UTC (rev 35313)
@@ -158,7 +158,7 @@
search.trash=Prullenbak
searchform.contenttype=Contenttype:
-searchform.contenttypes.all=alle types
+searchform.contenttypes.all=alle allowed contenttypes
searchform.creationdate=Creatiedatum:
searchform.expiredate=Verloopdatum:
searchform.lastmodifieddate=Laatste wijziging:
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
2009-05-19 17:52:26 UTC (rev 35312)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java
2009-05-20 06:02:08 UTC (rev 35313)
@@ -72,6 +72,7 @@
// Initialize
SearchForm searchForm = (SearchForm) form;
+ String portletId = request.getParameter("portletId");
String deleteContentRequest =
request.getParameter("deleteContentRequest");
String index = searchForm.getIndex();
if (StringUtils.isEmpty(index)) {
@@ -94,7 +95,10 @@
// First prepare the typeList, we'll need this one anyway:
List<LabelValueBean> typesList = new ArrayList<LabelValueBean>();
- List<NodeManager> types = ContentElementUtil.getContentTypes(cloud);
+ List<NodeManager> types =
cloud.getNode(portletId).getRelatedNodes("typedef", "allowrel", "destination");
+ if(types.size() == 0){
+ types = ContentElementUtil.getContentTypes(cloud);
+ }
List<String> hiddenTypes = ContentElementUtil.getHiddenTypes();
for (NodeManager manager : types) {
String name = manager.getName();
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
2009-05-19 17:52:26 UTC (rev 35312)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
2009-05-20 06:02:08 UTC (rev 35313)
@@ -1,22 +1,23 @@
package com.finalist.cmsc.repository.forms;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.lang.StringUtils;
-
+import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionForm;
import org.apache.struts.util.LabelValueBean;
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.NodeManager;
import org.mmbase.storage.search.SortOrder;
import com.finalist.cmsc.repository.ContentElementUtil;
import com.finalist.cmsc.struts.MMBaseAction;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
public class SearchInitAction extends MMBaseAction {
@Override
@@ -25,6 +26,7 @@
SearchForm searchForm = (SearchForm) form;
+ String portletId = request.getParameter("portletId");
if (StringUtils.isEmpty(searchForm.getExpiredate())) {
searchForm.setExpiredate("0");
}
@@ -46,7 +48,10 @@
}
List<LabelValueBean> typesList = new ArrayList<LabelValueBean>();
- List<NodeManager> types = ContentElementUtil.getContentTypes(cloud);
+ List<NodeManager> types =
cloud.getNode(portletId).getRelatedNodes("typedef", "allowrel", "destination");
+ if(types.size() == 0){
+ types = ContentElementUtil.getContentTypes(cloud);
+ }
List<String> hiddenTypes = ContentElementUtil.getHiddenTypes();
for (NodeManager manager : types) {
String name = manager.getName();
@@ -56,6 +61,7 @@
}
}
addToRequest(request, "typesList", typesList);
+ addToRequest(request, "portletId", portletId);
return mapping.findForward("searchoptions");
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-05-19 17:52:26 UTC (rev 35312)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-05-20 06:02:08 UTC (rev 35313)
@@ -20,6 +20,7 @@
<body>
<mm:import id="searchinit"><c:url
value='/editors/repository/SearchInitAction.do'/></mm:import>
<mm:import externid="action">search</mm:import><%-- either: search, link, of
select --%>
+<mm:import externid="portletId" from="parameters" />
<mm:import externid="mode" id="mode">basic</mm:import>
<mm:import externid="returnurl"/>
<mm:import externid="linktochannel"/>
@@ -84,6 +85,7 @@
<html:form action="/editors/repository/ContentSearchAction"
method="post">
<html:hidden property="action" value="${action}"/>
+ <html:hidden property="portletId" value="${portletId}"/>
<html:hidden property="mode"/>
<html:hidden property="search" value="true"/>
<html:hidden property="linktochannel"/>
@@ -119,10 +121,15 @@
<td style="width:300px"><html:text property="keywords"
style="width:200px"/></td>
<td style="width:105px"><fmt:message
key="searchform.contenttype" /></td>
<td>
- <html:select property="contenttypes"
onchange="selectContenttype('${searchinit}');" >
- <html:option value="contentelement"><<fmt:message
key="searchform.contenttypes.all" />></html:option>
- <html:optionsCollection name="typesList" value="value"
label="label"/>
- </html:select>
+ <c:if test="${fn:length(typesList) == 1}" >
+ <input type="text"
name="contenttypes" value="${typesList[0].value}" readonly="readonly" />
+ </c:if>
+ <c:if test="${fn:length(typesList) !=
1}" >
+ <html:select
property="contenttypes" onchange="selectContenttype('${searchinit}');" >
+ <html:option
value="contentelement"><<fmt:message key="searchform.contenttypes.all"
/>></html:option>
+ <html:optionsCollection
name="typesList" value="value" label="label"/>
+ </html:select>
+ </c:if>
</td>
</tr>
<tr>
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
2009-05-19 17:52:26 UTC (rev 35312)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp
2009-05-20 06:02:08 UTC (rev 35313)
@@ -5,6 +5,7 @@
<mm:import externid="channel" from="parameters" />
<mm:import externid="contentnumber" from="parameters" />
<mm:import externid="action" from="parameters" />
+<mm:import externid="portletId" from="parameters" />
<mm:cloud loginpage="../../login.jsp">
@@ -46,7 +47,7 @@
<mm:url page="/editors/repository/select/SelectorContent.do"
id="channelsurl" write="false" />
</mm:notpresent>
<mm:notpresent referid="contenturl">
- <mm:url
page="/editors/repository/SearchInitAction.do?action=select&mode=advanced"
id="contenturl" write="false" />
+ <mm:url
page="/editors/repository/SearchInitAction.do?action=select&mode=advanced&portletId=${portletId}"
id="contenturl" write="false" />
</mm:notpresent>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd";>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/definitiondisplay.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/definitiondisplay.jsp
2009-05-19 17:52:26 UTC (rev 35312)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/definitiondisplay.jsp
2009-05-20 06:02:08 UTC (rev 35313)
@@ -9,6 +9,7 @@
<mm:cloud>
<mm:node
number="${requestScope['com.finalist.cmsc.beans.om.definitionId']}"
notfound="skip">
<td>
+ <c:set var="portletId"
scope="request"><mm:field name='number'/></c:set>
<input type="text" name="portletname"
value="<mm:field name='title'/>" disabled="disabled"/>
</td>
</mm:node>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/selectchannel.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/selectchannel.jsp
2009-05-19 17:52:26 UTC (rev 35312)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/selectchannel.jsp
2009-05-20 06:02:08 UTC (rev 35313)
@@ -10,7 +10,7 @@
<a href="javascript:openRepositoryWithChannel()">
<img src="<cmsc:staticurl
page='/editors/gfx/icons/preview.png'/>" alt="<fmt:message
key="edit_defaults.preview"/>"/>
</a>
- <a href="<c:url
value='/editors/repository/select/SelectorChannel.do?channel=${contentchannel}'
/>" target="selectchannel" onclick="openPopupWindow('selectchannel', 340,
400)">
+ <a href="<c:url
value='/editors/repository/select/SelectorChannel.do?channel=${contentchannel}&portletId=${portletId}'
/>" target="selectchannel" onclick="openPopupWindow('selectchannel', 340,
400)">
<img src="<cmsc:staticurl
page='/editors/gfx/icons/select.png'/>" alt="<fmt:message
key="edit_defaults.channelselect" />"/>
</a>
<a
href="javascript:erase('contentchannel');erase('contentchannelpath')">
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/selectelement.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/selectelement.jsp
2009-05-19 17:52:26 UTC (rev 35312)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/sections/selectelement.jsp
2009-05-20 06:02:08 UTC (rev 35313)
@@ -7,8 +7,8 @@
<tr>
<td><fmt:message key="edit_defaults.contentelement" />:</td>
<td align="right">
- <a href="<c:url
value='/editors/repository/select/index.jsp?contentnumber=${contentelement}'
/>" target="selectcontentelement"
onclick="openPopupWindow('selectcontentelement', 900, 400)">
- <img src="<cmsc:staticurl
page='/editors/gfx/icons/select.png'/>" alt="<fmt:message
key="edit_defaults.contentselect" />"/>
+ <a href="<c:url
value='/editors/repository/select/index.jsp?contentnumber=${contentelement}&portletId=${portletId}'
/>" target="selectcontentelement"
onclick="openPopupWindow('selectcontentelement', 900, 400)">
+ <img src="<cmsc:staticurl
page='/editors/gfx/icons/select.png'/>" alt="<fmt:message
key="edit_defaults.contentselect" />" />
</a>
<a
href="javascript:erase('contentelement');erase('contentelementtitle')">
<img src="<cmsc:staticurl
page='/editors/gfx/icons/erase.png'/>" alt="<fmt:message
key="edit_defaults.erase"/>"/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
