Author: kevinshen
Date: 2009-10-22 08:58:38 +0200 (Thu, 22 Oct 2009)
New Revision: 39280
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/DeleteAction.java
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAction.java
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAssetAction.java
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/restore.jsp
Log:
CMSC-1568 Sorting is lost when using paging in trashbin of the content
respository
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/DeleteAction.java
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/DeleteAction.java
2009-10-22 06:17:13 UTC (rev 39279)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/DeleteAction.java
2009-10-22 06:58:38 UTC (rev 39280)
@@ -65,12 +65,15 @@
}
objectNode.delete(true);
}
- addToRequest(request, "fresh", "true");
- if (type.equalsIgnoreCase("content")) {
- return mapping.findForward("content");
- } else {
- return mapping.findForward("asset");
- }
+ ActionForward ret = new ActionForward(getParameter(request,
"returnurl")+"&fresh=true");
+ ret.setRedirect(true);
+ return ret;
+ // addToRequest(request, "fresh", "true");
+// if (type.equalsIgnoreCase("content")) {
+// return mapping.findForward("content");
+// } else {
+// return mapping.findForward("asset");
+// }
}
}
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAction.java
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAction.java
2009-10-22 06:17:13 UTC (rev 39279)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAction.java
2009-10-22 06:58:38 UTC (rev 39280)
@@ -32,7 +32,7 @@
String objectnumber = getParameter(request, "objectnumber");
Node objectNode = cloud.getNode(objectnumber);
-
+ String returnurl = getParameter(request, "returnurl");
NodeList contentchannels =
RepositoryUtil.getDeletionChannels(objectNode);
if (contentchannels.size() > 0) {
if (contentchannels.size() == 1) {
@@ -50,6 +50,7 @@
else {
addToRequest(request, "content", objectNode);
addToRequest(request, "contentchannels", contentchannels);
+ addToRequest(request, "returnurl", returnurl);
return mapping.findForward("restore");
}
}
@@ -65,11 +66,13 @@
contentchannels = RepositoryUtil.getAllContentChannels(cloud);
addToRequest(request, "content", objectNode);
addToRequest(request, "contentchannels", contentchannels);
+ addToRequest(request, "returnurl", returnurl);
return mapping.findForward("restore");
}
-
}
- addToRequest(request, "fresh", "true");
- return mapping.findForward(SUCCESS);
+ ActionForward ret = new ActionForward(returnurl+"&fresh=true");
+ ret.setRedirect(true);
+ // addToRequest(request, "fresh", "true");
+ return ret;
}
}
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAssetAction.java
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAssetAction.java
2009-10-22 06:17:13 UTC (rev 39279)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAssetAction.java
2009-10-22 06:58:38 UTC (rev 39280)
@@ -32,7 +32,7 @@
String objectnumber = getParameter(request, "objectnumber");
Node objectNode = cloud.getNode(objectnumber);
-
+ String returnurl = getParameter(request, "returnurl");
NodeList channels = RepositoryUtil.getDeletionChannels(objectNode);
if (channels.size() > 0) {
if (channels.size() == 1) {
@@ -50,6 +50,7 @@
else {
addToRequest(request, "", objectNode);
addToRequest(request, "channels", channels);
+ addToRequest(request, "returnurl", returnurl);
return mapping.findForward("restore");
}
}
@@ -62,7 +63,9 @@
Workflow.create(objectNode, null);
}
}
- addToRequest(request, "fresh", "true");
- return mapping.findForward(SUCCESS);
+ ActionForward ret = new ActionForward(returnurl+"&fresh=true");
+ ret.setRedirect(true);
+ // addToRequest(request, "fresh", "true");
+ return ret;
}
}
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp
2009-10-22 06:17:13 UTC (rev 39279)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp
2009-10-22 06:58:38 UTC (rev 39280)
@@ -6,14 +6,15 @@
<html:html xhtml="true">
<cmscedit:head title="recyclebin.title">
<script src="recyclebin.js" type="text/javascript"></script>
- <c:if test="${not empty fresh}">
+ <c:if test="${not empty param.fresh}">
<script type="text/javascript">
refreshChannels();
</script>
</c:if>
</cmscedit:head>
<mm:import externid="direction" jspvar="direction">up</mm:import>
-<mm:import externid="sortBy" jspvar="sortBy">title</mm:import>
+<mm:import externid="orderby" jspvar="orderby">title</mm:import>
+<c:set var="extraparams" value="&direction=${direction}"/>
<c:set var="direction">
<c:out value="${direction =='up'?'down':'up' }"/>
</c:set>
@@ -72,10 +73,10 @@
<div class="body">
<mm:node number="$parentchannel">
<mm:relatednodescontainer
path="creationrel,assetelement" searchdirs="source" element="assetelement">
- <mm:sortorder field="assetelement.${sortBy}"
direction="${direction}" />
+ <mm:sortorder field="assetelement.${orderby}"
direction="${direction}" />
<c:set var="listSize"><mm:size/></c:set>
- <c:set var="resultsPerPage" value="50"/>
+ <c:set var="resultsPerPage" value="5"/>
<c:set var="offset" value="${not empty
param.offset ? param.offset : '0'}"/>
<mm:listnodes jspvar="node"
max="${resultsPerPage}" offset="${offset*resultsPerPage}">
@@ -85,11 +86,11 @@
<thead>
<tr>
<th style="width: 56px;"></th>
- <th style="width: 68px;"><a
href="assettrash.jsp?sortBy=otype&direction=${direction}"
class="headerlink"><fmt:message key="locate.typecolumn" /></a></th>
- <th><a
href="assettrash.jsp?sortBy=title&direction=${direction}"
class="headerlink"><fmt:message key="locate.titlecolumn" /></a></th>
- <th style="width: 120px;"><a
href="assettrash.jsp?sortBy=lastmodifier&direction=${direction}"
class="headerlink"><fmt:message key="locate.editorcolumn" /></a></th>
- <th style="width: 120px;"><a
href="assettrash.jsp?sortBy=lastmodifieddate&direction=${direction}"
class="headerlink"><fmt:message key="locate.lastmodifiedcolumn" /></a></th>
- <th style="width: 60px;"><a
href="assettrash.jsp?sortBy=number&direction=${direction}"
class="headerlink"><fmt:message key="locate.numbercolumn" /></a></th>
+ <th style="width: 68px;"><a
href="assettrash.jsp?orderby=otype&direction=${direction}"
class="headerlink"><fmt:message key="locate.typecolumn" /></a></th>
+ <th><a
href="assettrash.jsp?orderby=title&direction=${direction}"
class="headerlink"><fmt:message key="locate.titlecolumn" /></a></th>
+ <th style="width: 120px;"><a
href="assettrash.jsp?orderby=lastmodifier&direction=${direction}"
class="headerlink"><fmt:message key="locate.editorcolumn" /></a></th>
+ <th style="width: 120px;"><a
href="assettrash.jsp?orderby=lastmodifieddate&direction=${direction}"
class="headerlink"><fmt:message key="locate.lastmodifiedcolumn" /></a></th>
+ <th style="width: 60px;"><a
href="assettrash.jsp?orderby=number&direction=${direction}"
class="headerlink"><fmt:message key="locate.numbercolumn" /></a></th>
</tr>
</thead>
<tbody class="hover">
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp
2009-10-22 06:17:13 UTC (rev 39279)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp
2009-10-22 06:58:38 UTC (rev 39280)
@@ -6,14 +6,15 @@
<html:html xhtml="true">
<cmscedit:head title="recyclebin.title">
<script src="recyclebin.js" type="text/javascript"></script>
- <c:if test="${not empty fresh && fresh == 'true'}">
+ <c:if test="${not empty param.fresh && param.fresh == 'true'}">
<script type="text/javascript">
refreshChannels();
</script>
</c:if>
</cmscedit:head>
<mm:import externid="direction" jspvar="direction">up</mm:import>
-<mm:import externid="sortBy" jspvar="sortBy">title</mm:import>
+<mm:import externid="orderby" jspvar="orderby">title</mm:import>
+<c:set var="extraparams" value="&direction=${direction}"/>
<c:set var="direction">
<c:out value="${direction =='up'?'down':'up' }"/>
</c:set>
@@ -72,10 +73,10 @@
<div class="body">
<mm:node number="$parentchannel">
<mm:relatednodescontainer
path="contentrel,contentelement" searchdirs="destination"
element="contentelement">
- <mm:sortorder field="contentelement.${sortBy}"
direction="${direction}" />
+ <mm:sortorder field="contentelement.${orderby}"
direction="${direction}" />
<c:set var="listSize"><mm:size/></c:set>
- <c:set var="resultsPerPage" value="50"/>
+ <c:set var="resultsPerPage" value="5"/>
<c:set var="offset" value="${not empty
param.offset ? param.offset : '0'}"/>
<mm:listnodes jspvar="node"
max="${resultsPerPage}" offset="${offset*resultsPerPage}">
@@ -86,11 +87,11 @@
<thead>
<tr>
<th style="width: 56px;"></th>
- <th style="width: 68px;"><a
href="contenttrash.jsp?sortBy=otype&direction=${direction}"
class="headerlink"><fmt:message key="locate.typecolumn" /></a></th>
- <th><a
href="contenttrash.jsp?sortBy=title&direction=${direction}"
class="headerlink"><fmt:message key="locate.titlecolumn" /></a></th>
- <th style="width: 120px;"><a
href="contenttrash.jsp?sortBy=lastmodifier&direction=${direction}"
class="headerlink"><fmt:message key="locate.editorcolumn" /></a></th>
- <th style="width: 120px;"><a
href="contenttrash.jsp?sortBy=lastmodifieddate&direction=${direction}"
class="headerlink"><fmt:message key="locate.lastmodifiedcolumn" /></a></th>
- <th style="width: 60px;"><a
href="contenttrash.jsp?sortBy=number&direction=${direction}"
class="headerlink"><fmt:message key="locate.numbercolumn" /></a></th>
+ <th style="width: 68px;"><a
href="contenttrash.jsp?orderby=otype&direction=${direction}"
class="headerlink"><fmt:message key="locate.typecolumn" /></a></th>
+ <th><a
href="contenttrash.jsp?orderby=title&direction=${direction}"
class="headerlink"><fmt:message key="locate.titlecolumn" /></a></th>
+ <th style="width: 120px;"><a
href="contenttrash.jsp?orderby=lastmodifier&direction=${direction}"
class="headerlink"><fmt:message key="locate.editorcolumn" /></a></th>
+ <th style="width: 120px;"><a
href="contenttrash.jsp?orderby=lastmodifieddate&direction=${direction}"
class="headerlink"><fmt:message key="locate.lastmodifiedcolumn" /></a></th>
+ <th style="width: 60px;"><a
href="contenttrash.jsp?orderby=number&direction=${direction}"
class="headerlink"><fmt:message key="locate.numbercolumn" /></a></th>
</tr>
</thead>
<tbody class="hover">
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/restore.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/restore.jsp
2009-10-22 06:17:13 UTC (rev 39279)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/restore.jsp
2009-10-22 06:58:38 UTC (rev 39280)
@@ -44,6 +44,7 @@
<mm:url page="RestoreAction.do"
id="url" write="false" >
<mm:param name="channelnumber"
value="$channelnumber"/>
<mm:param name="objectnumber"
value="$contentnumber"/>
+ <mm:param
name="returnurl" value="$returnurl"/>
</mm:url>
<li>
<a href="<mm:write
referid="url"/>">
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
