Merge pull request #40 from cekk/fix_accesscontrol

Fixed version fo AccessControl
collective · Jul 10, 2014 · d6accf8 · d6accf8
2 parents acd5df2 + 198ca3a
commit d6accf8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -13,6 +13,13 @@ Changelog
 - update pt-br translations
   [agnogueira]
 
+- Fixed dependency for AccessControl. Plone < 4.3 have an old version pinned
+  [cekk]
+
+- Fix catalog definition in comment_redirect_to_conversation after PloneboardConversation refactoring
+  [cekk]
+
+
 3.5 (2014-03-07)
 ----------------
 

diff --git a/setup.py b/setup.py
@@ -39,6 +39,7 @@
         'plone.i18n',
         'Products.CMFPlacefulWorkflow',
         'python-dateutil<2.0dev',
+        'AccessControl>=3.0',
     ],
     extras_require=dict(
         test=['plone.app.testing',

diff --git a/src/Products/Ploneboard/skins/ploneboard_scripts/comment_redirect_to_conversation.py b/src/Products/Ploneboard/skins/ploneboard_scripts/comment_redirect_to_conversation.py
@@ -11,13 +11,13 @@
 # XXX if we ever do batching, we need extra logic here.
 redirect_target = context.getConversation()
 anchor = context.getId()
-  
+
 conv = context.getConversation()
 query = {'object_implements' : 'Products.Ploneboard.interfaces.IComment',
          'sort_on'           : 'created',
          'path'              : '/'.join(conv.getPhysicalPath()),
         }
-catalog=conv.getCatalog()
+catalog = context.portal_catalog
 res = [ x.getId for x in catalog(query) ]
 if anchor in res:
     pos = res.index(anchor)