Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
In directory james.mmbase.org:/tmp/cvs-serv14268/webapp/editors/recyclebin

Modified Files:
        assettrash.jsp contenttrash.jsp 
Log Message:
CMSC-681 Asset Maintenance When browsing through the recycle bin, the site tree 
is refreshed without any reason


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
See also: http://www.mmbase.org/jira/browse/CMSC-681


Index: assettrash.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/assettrash.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- assettrash.jsp      22 Dec 2008 08:44:57 -0000      1.4
+++ assettrash.jsp      13 Jan 2009 05:54:03 -0000      1.5
@@ -6,13 +6,18 @@
 <html:html xhtml="true">
 <cmscedit:head title="recyclebin.title">
   <script src="recyclebin.js" type="text/javascript"></script>
+  <c:if test="${not empty 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>
 <c:set var="direction">
    <c:out value="${direction =='up'?'down':'up' }"/>
 </c:set>
-<body onload="refreshChannels();">
+<body>
 <div class="tabs">
     <!-- active TAB -->
    <div class="tab">


Index: contenttrash.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/contenttrash.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- contenttrash.jsp    22 Dec 2008 08:46:13 -0000      1.2
+++ contenttrash.jsp    13 Jan 2009 05:54:03 -0000      1.3
@@ -6,13 +6,18 @@
 <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'}">
+     <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>
 <c:set var="direction">
    <c:out value="${direction =='up'?'down':'up' }"/>
 </c:set>
-<body onload="refreshChannels();">
+<body>
 <div class="tabs">
     <!-- active TAB -->
    <div class="tab_active">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to