Removing hard coded publish action. evilbungle branch merge.
svn path=/plone.app.discussion/trunk/; revision=30669
This commit is contained in:
		
							parent
							
								
									7ef2672e5c
								
							
						
					
					
						commit
						8db9c8c175
					
				@ -118,8 +118,7 @@ class PublishComment(BrowserView):
 | 
			
		||||
        comment = aq_inner(self.context)
 | 
			
		||||
        comment_id = self.context.id
 | 
			
		||||
 | 
			
		||||
        #workflow_action = self.request.form['workflow_action']
 | 
			
		||||
        workflow_action = 'publish'
 | 
			
		||||
        workflow_action = self.request.form['workflow_action']
 | 
			
		||||
        portal_workflow = getToolByName(comment, 'portal_workflow')
 | 
			
		||||
        portal_workflow.doActionFor(comment, workflow_action)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -95,7 +95,7 @@ class TestCommentOperations(PloneTestCase):
 | 
			
		||||
 | 
			
		||||
    def test_publish(self):
 | 
			
		||||
        self.portal.REQUEST.form['comment_id'] = self.comment_id
 | 
			
		||||
        self.portal.REQUEST.form['action'] = 'publish'
 | 
			
		||||
        self.portal.REQUEST.form['workflow_action'] = 'publish'
 | 
			
		||||
        self.assertEquals('pending', self.portal.portal_workflow.getInfoFor(self.comment, 'review_state'))
 | 
			
		||||
        view = self.comment.restrictedTraverse('@@moderate-publish-comment')
 | 
			
		||||
        view()
 | 
			
		||||
@ -104,7 +104,7 @@ class TestCommentOperations(PloneTestCase):
 | 
			
		||||
    def test_publish_as_anonymous(self):
 | 
			
		||||
        self.logout()
 | 
			
		||||
        self.portal.REQUEST.form['comment_id'] = self.comment_id
 | 
			
		||||
        self.portal.REQUEST.form['action'] = 'publish'
 | 
			
		||||
        self.portal.REQUEST.form['workflow_action'] = 'publish'
 | 
			
		||||
        self.assertEquals('pending', self.portal.portal_workflow.getInfoFor(self.comment, 'review_state'))
 | 
			
		||||
        self.assertRaises(Unauthorized,
 | 
			
		||||
                          self.comment.restrictedTraverse,
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user