Author: kevinshen Date: 2010-03-02 09:27:45 +0100 (Tue, 02 Mar 2010) New Revision: 41218
Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js Log: CMSC-1568 Sorting is lost when using paging intrashbin and in a content channel Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp =================================================================== --- CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp 2010-03-02 08:25:58 UTC (rev 41217) +++ CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp 2010-03-02 08:27:45 UTC (rev 41218) @@ -13,7 +13,7 @@ </script> </c:if> </cmscedit:head> -<mm:import externid="direction" jspvar="direction">up</mm:import> +<mm:import externid="direction" jspvar="direction">down</mm:import> <mm:import externid="sortBy" jspvar="sortBy">title</mm:import> <c:set var="olddirection" value="${direction}"/> <c:set var="direction"> Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp =================================================================== --- CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp 2010-03-02 08:25:58 UTC (rev 41217) +++ CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp 2010-03-02 08:27:45 UTC (rev 41218) @@ -13,7 +13,7 @@ </script> </c:if> </cmscedit:head> -<mm:import externid="direction" jspvar="direction">up</mm:import> +<mm:import externid="direction" jspvar="direction">down</mm:import> <mm:import externid="sortBy" jspvar="sortBy">title</mm:import> <c:set var="olddirection" value="${direction}"/> <c:set var="direction"> Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js =================================================================== --- CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js 2010-03-02 08:25:58 UTC (rev 41217) +++ CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js 2010-03-02 08:27:45 UTC (rev 41218) @@ -59,7 +59,7 @@ } else { document.forms['initForm'].order.value = orderColumn; - document.forms['initForm'].direction.value = 'down'; + document.forms['initForm'].direction.value = 'up'; } newDirection=document.forms['initForm'].direction.value; type=document.forms['initForm'].order.value; _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs