Changeset 992


Ignore:
Timestamp:
10/31/06 15:31:39 (13 years ago)
Author:
jukka
Message:

Fixed #895, spent 20min.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ConfigurationMethods.py

    r982 r992  
    302302    # Update all resources to have permissions that match the current workflow spec 
    303303    wtool.updateRoleMappings() 
     304    portal.manage_permission('Review portal content', ('Manager','Owner','Reviewer'), acquire=1) 
     305 
    304306 
    305307def setupTopics(self, portal): 
  • trunk/Resources.py

    r991 r992  
    487487 
    488488 
    489     security.declareProtected(DELETE_CONTENT, 'deleteResource') 
     489    security.declareProtected(ModerateContent, 'deleteResource') 
    490490    def deleteResource(self, reason=''): 
    491491        """Set reason for deletion, set state to deleted and update catalog""" 
     
    497497        self.reindexObject()         
    498498 
    499     security.declareProtected(DELETE_CONTENT, 'rescue') 
     499    security.declareProtected(ModerateContent, 'rescue') 
    500500    def rescue(self): 
    501501        """Undelete a resource """ 
     
    504504        self.undeleteResource() 
    505505 
    506     security.declareProtected(DELETE_CONTENT, 'undeleteResource') 
     506    security.declareProtected(ModerateContent, 'undeleteResource') 
    507507    def undeleteResource(self): 
    508508        f=self.getField('deletionReason') 
  • trunk/permissions.py

    r615 r992  
    2828LIST_FOLDER_CONTENTS = permissions.ListFolderContents 
    2929MODIFY_CONTENT = permissions.ModifyPortalContent 
    30 DELETE_CONTENT = permissions.DeleteObjects 
     30DELETE_CONTENT = permissions.ReviewPortalContent 
    3131MANAGE_PORTAL = permissions.ManagePortal 
    3232VIEW = permissions.View 
Note: See TracChangeset for help on using the changeset viewer.