From c4ff0210e562beb04bd0de24db49a5b5b1433920 Mon Sep 17 00:00:00 2001
From: Dylan Jay <software@pretaweb.com>
Date: Wed, 18 Dec 2013 18:08:51 +1100
Subject: [PATCH] switch to ModifyPortalContent as main permission

---
 .../EasyNewsletter/browser/configure.zcml     | 16 ++++++------
 .../EasyNewsletter/tests/test_newsletter.py   | 26 +++++++++++++++++++
 buildout.cfg                                  |  5 +++-
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/Products/EasyNewsletter/browser/configure.zcml b/Products/EasyNewsletter/browser/configure.zcml
index 2f75fe54..1a3fa01c 100644
--- a/Products/EasyNewsletter/browser/configure.zcml
+++ b/Products/EasyNewsletter/browser/configure.zcml
@@ -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"
@@ -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"
@@ -45,7 +45,7 @@
     name="daily-issue"
     for="..interfaces.IEasyNewsletter"
     class=".daily_issue.DailyIssueView"
-    permission="cmf.ManagePortal" />
+    permission="cmf.ModifyPortalContent" />
 
   <browser:page
     name="unsubscribe"
@@ -87,20 +87,20 @@
     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"
@@ -108,7 +108,7 @@
     manager="plone.app.layout.viewlets.interfaces.IAboveContentTitle"
     class=".viewlets.ENLActionsViewlet"
     template="templates/enl_actions_viewlet.pt"
-    permission="cmf.ManagePortal"
+    permission="cmf.ModifyPortalContent"
     />
 
   <browser:resource
diff --git a/Products/EasyNewsletter/tests/test_newsletter.py b/Products/EasyNewsletter/tests/test_newsletter.py
index f535f434..5b4f891e 100644
--- a/Products/EasyNewsletter/tests/test_newsletter.py
+++ b/Products/EasyNewsletter/tests/test_newsletter.py
@@ -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__)
 
diff --git a/buildout.cfg b/buildout.cfg
index 9563565d..c4e3e50d 100644
--- a/buildout.cfg
+++ b/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
@@ -30,3 +30,6 @@ recipe = zc.recipe.egg
 eggs = ${instance:eggs}
 interpreter = zopepy
 scripts = zopepy
+
+[versions]
+zc.buildout = 1.7.1
\ No newline at end of file