Skip to content

Commit

Permalink
switch to ModifyPortalContent as main permission
Browse files Browse the repository at this point in the history
  • Loading branch information
djay committed Dec 18, 2013
1 parent 34e8a35 commit c4ff021
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 9 deletions.
16 changes: 8 additions & 8 deletions Products/EasyNewsletter/browser/configure.zcml
Expand Up @@ -11,7 +11,7 @@
for="..interfaces.IENLIssue"
class=".issue.IssueView"
template="issue_send_form.pt"
permission="cmf.ManagePortal" />
permission="cmf.ModifyPortalContent" />

<browser:page
name="get-public-body"
Expand All @@ -25,14 +25,14 @@
for="..interfaces.IENLIssue"
class=".issue.IssueView"
attribute="send_issue"
permission="cmf.ManagePortal" />
permission="cmf.ModifyPortalContent" />

<browser:page
name="refresh-issue"
for="..interfaces.IENLIssue"
class=".issue.IssueView"
attribute="refresh_issue"
permission="cmf.ManagePortal" />
permission="cmf.ModifyPortalContent" />

<browser:page
name="enl_public_view"
Expand All @@ -45,7 +45,7 @@
name="daily-issue"
for="..interfaces.IEasyNewsletter"
class=".daily_issue.DailyIssueView"
permission="cmf.ManagePortal" />
permission="cmf.ModifyPortalContent" />

<browser:page
name="unsubscribe"
Expand Down Expand Up @@ -87,28 +87,28 @@
name="enl_subscribers_view"
class=".subscribers.Enl_Subscribers_View"
template="enl_subscribers_view.pt"
permission="cmf.ManagePortal" />
permission="cmf.ModifyPortalContent" />

<browser:page
for="..interfaces.IEasyNewsletter"
name="upload_csv"
class=".subscribers.UploadCSV"
template="upload_csv.pt"
permission="cmf.ManagePortal" />
permission="cmf.ModifyPortalContent" />

<browser:page
for="..interfaces.IEasyNewsletter"
name="download_csv"
class=".subscribers.DownloadCSV"
permission="cmf.ManagePortal" />
permission="cmf.ModifyPortalContent" />

<browser:viewlet
name="enl.newsletter_actions"
for="Products.EasyNewsletter.interfaces.IEasyNewsletter"
manager="plone.app.layout.viewlets.interfaces.IAboveContentTitle"
class=".viewlets.ENLActionsViewlet"
template="templates/enl_actions_viewlet.pt"
permission="cmf.ManagePortal"
permission="cmf.ModifyPortalContent"
/>

<browser:resource
Expand Down
26 changes: 26 additions & 0 deletions Products/EasyNewsletter/tests/test_newsletter.py
Expand Up @@ -159,6 +159,32 @@ def test_mailonly_filter_in_issue_public_view(self):

self.assertTrue('mailonly' not in view_result, 'get-public-body view contains mailonly elements, this should filtert out!')


def test_permission(self):
setRoles(self.portal, TEST_USER_ID, ['Editor'])
self.portal.REQUEST.set('ACTUAL_URL','http://nohost')
self.newsletter.invokeFactory(
"ENLIssue",
id="issue")
self.newsletter.issue.title="Test Newsletter Issue"
self.newsletter.issue.setText("<h1>This is the newsletter body!")

view = self.newsletter.restrictedTraverse("enl_drafts_view")
view_result = view()
self.assertIn('test-folder/newsletter/issue', view_result)

view = self.newsletter.restrictedTraverse("issue/send-issue-form")
view_result = view()

self.assertIn('Test Newsletter', view_result)

view = self.newsletter.restrictedTraverse("issue/send-issue")
view_result = view()

self.assertIn('issue', view_result)



def test_suite():
return unittest.defaultTestLoader.loadTestsFromName(__name__)

5 changes: 4 additions & 1 deletion buildout.cfg
@@ -1,6 +1,6 @@
[buildout]
extends =
https://raw.github.com/collective/buildout.plonetest/master/test-4.3.x.cfg
https://raw.github.com/collective/buildout.plonetest/master/test-4.1.x.cfg
https://raw.github.com/collective/buildout.plonetest/master/qa.cfg

package-name = Products.EasyNewsletter
Expand Down Expand Up @@ -30,3 +30,6 @@ recipe = zc.recipe.egg
eggs = ${instance:eggs}
interpreter = zopepy
scripts = zopepy

[versions]
zc.buildout = 1.7.1

0 comments on commit c4ff021

Please sign in to comment.