[CMF-checkins] CVS: CMF - clearCookie.dtml:1.2 folder_contents.dtml:1.8

[tseaver@digicool.com]

Update of /cvs-repository/CMF/CMFDefault/skins/generic
In directory korak.digicool.com:/tmp/cvs-serv18453/CMFDefault/skins/generic

Modified Files:
	clearCookie.dtml folder_contents.dtml 
Log Message:


 - Merge changes to implement new permission, "List folder contents",
   used by 'folder_contents', 'CMFCore.PortalFolder', etc. to protect
   the "contents" view of a folder (Tracker #320).
   
   Note that this is really only a UI change:  'PortalFolder.contentIds',
   'PortalFolder.contentValues', and 'PortalFolder.contentItems' are
   still public, to allow for reasonable "site map" views on folders.




--- Updated File clearCookie.dtml in package CMF --
--- clearCookie.dtml	2001/02/23 14:24:09	1.1
+++ clearCookie.dtml	2001/06/19 19:14:56	1.2
@@ -1,2 +1,5 @@
-<dtml-call "RESPONSE.expireCookie('folderfilter', path='/')">
-<dtml-call "RESPONSE.redirect(absolute_url() + '/folder_contents')">
+<dtml-call expr="RESPONSE.expireCookie('folderfilter', path='/')">
+<dtml-call expr="RESPONSE.redirect( absolute_url()
+                                  + '/folder_contents'
+                                  + '?portal_status_message=Filter+cleared.'
+                                  )">

--- Updated File folder_contents.dtml in package CMF --
--- folder_contents.dtml	2001/06/11 20:54:42	1.7
+++ folder_contents.dtml	2001/06/19 19:14:56	1.8
@@ -21,7 +21,7 @@
 <dtml-call "REQUEST.set('isDesktop', 1)">
 <dtml-var standard_html_header>
 
-<dtml-if "not portal_membership.checkPermission('Access contents information'
+<dtml-if "not portal_membership.checkPermission('List folder contents'
                                                , this())">
  <dtml-call "RESPONSE.redirect(absolute_url())">
 </dtml-if>
@@ -36,7 +36,7 @@
   <tr>
    <td valign="top">
     <table class="ContentsList">
-     <dtml-if "portal_membership.checkPermission( 'Access contents information'
+     <dtml-if "portal_membership.checkPermission( 'List folder contents'
                                                 , this(), 'aq_parent')">
       <dtml-let upNav="_.hasattr(this().aq_parent, 'portal_url')"
                 upID="this().aq_parent.getId()"
@@ -62,8 +62,10 @@
      </dtml-if>
 
 
-<dtml-in expr="contentValues(filter=decodeFolderFilter(
-         REQUEST.get('folderfilter', '')))"
+<dtml-let filterString="REQUEST.get( 'folderfilter', '' )"
+          filter="decodeFolderFilter( filterString )"
+>
+<dtml-in expr="listFolderContents( filter=filter )"
          sort="getId" size="19" start=qs skip_unauthorized>
  <dtml-if next-sequence>
   <dtml-call "REQUEST.set('next-sequence'
@@ -117,6 +119,7 @@
   </dtml-if>
  </dtml-let>
 </dtml-in>
+</dtml-let>
     </table>
    </td>
   </tr>