[Collective-checkins] r249901 - in fourdigits.portlet.twitter/trunk: . docs fourdigits/portlet/twitter fourdigits/portlet/twitter/profiles/default

[Ralph J. <svn...@pl...>]

Author: ralphjacobs
Date: Fri May 11 14:07:28 2012
New Revision: 249901

Modified:
   fourdigits.portlet.twitter/trunk/docs/HISTORY.txt
   fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/__init__.py
   fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/configure.zcml
   fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/profiles/default/metadata.xml
   fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/version.txt
   fourdigits.portlet.twitter/trunk/setup.py
Log:
Merged changes for Site Administrator from terapyon into trunk

Modified: fourdigits.portlet.twitter/trunk/docs/HISTORY.txt
==============================================================================
--- fourdigits.portlet.twitter/trunk/docs/HISTORY.txt	(original)
+++ fourdigits.portlet.twitter/trunk/docs/HISTORY.txt	Fri May 11 14:07:28 2012
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.9.2
+-------------------
+- Adding original permission for Site Administrator [terapyon]
+- Adding test code for portlet base [terapyon]
+
 0.9.1
 -------------------
 - Fixed missing files in 0.9 package [sjoerdve]

Modified: fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/__init__.py
==============================================================================
--- fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/__init__.py	(original)
+++ fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/__init__.py	Fri May 11 14:07:28 2012
@@ -2,6 +2,9 @@
 name = 'fourdigits.portlet.twitter'
 FourdigitsPortletTwitterMessageFactory = MessageFactory(name)
 
+from Products.CMFCore.permissions import setDefaultRoles
+setDefaultRoles('fourdigits.portlet.twitter: Add FourdigitsPortletTwitter',
+                ('Manager', 'Site Administrator', 'Owner',))
 
 def initialize(context):
     """Initializer called when used as a Zope 2 product."""

Modified: fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/configure.zcml
==============================================================================
--- fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/configure.zcml	(original)
+++ fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/configure.zcml	Fri May 11 14:07:28 2012
@@ -23,12 +23,17 @@
        provides="Products.GenericSetup.interfaces.EXTENSION"
        />
 
+    <permission
+       id="fourdigits.portlet.twitter.AddFourdigitsPortletTwitter"
+       title="fourdigits.portlet.twitter: Add FourdigitsPortletTwitter"
+       />
+
     <plone:portlet
         name="fourdigits.portlet.twitter.FourdigitsPortletTwitter"
         interface=".fourdigitsportlettwitter.IFourdigitsPortletTwitter"
         assignment=".fourdigitsportlettwitter.Assignment"
         view_permission="zope2.View"
-        edit_permission="cmf.ManagePortal"
+        edit_permission="fourdigits.portlet.twitter.AddFourdigitsPortletTwitter"
         renderer=".fourdigitsportlettwitter.Renderer"
         addview=".fourdigitsportlettwitter.AddForm"
         editview=".fourdigitsportlettwitter.EditForm"

Modified: fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/profiles/default/metadata.xml
==============================================================================
--- fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/profiles/default/metadata.xml	(original)
+++ fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/profiles/default/metadata.xml	Fri May 11 14:07:28 2012
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-    <version>0.9.1</version>
+    <version>0.9.2</version>
 </metadata>

Modified: fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/version.txt
==============================================================================
--- fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/version.txt	(original)
+++ fourdigits.portlet.twitter/trunk/fourdigits/portlet/twitter/version.txt	Fri May 11 14:07:28 2012
@@ -1 +1 @@
-0.9.1
+0.9.2

Modified: fourdigits.portlet.twitter/trunk/setup.py
==============================================================================
--- fourdigits.portlet.twitter/trunk/setup.py	(original)
+++ fourdigits.portlet.twitter/trunk/setup.py	Fri May 11 14:07:28 2012
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '0.9.1'
+version = '0.9.2'
 
 setup(name='fourdigits.portlet.twitter',
       version=version,