This commit is contained in:
Timo Stollenwerk 2013-04-18 15:31:40 +02:00
parent 849299f233
commit 0b8112fda1

View File

@ -64,8 +64,9 @@ class ConversationView(object):
return False return False
# Always return False if object is a folder # Always return False if object is a folder
if (IFolderish.providedBy(context) and context_is_folderish = IFolderish.providedBy(context)
not INonStructuralFolder.providedBy(context)): context_is_structural = not INonStructuralFolder.providedBy(context)
if (context_is_folderish and context_is_structural):
return False return False
def traverse_parents(context): def traverse_parents(context):
@ -73,8 +74,9 @@ class ConversationView(object):
# enabled in a parent folder. # enabled in a parent folder.
for obj in aq_chain(context): for obj in aq_chain(context):
if not IPloneSiteRoot.providedBy(obj): if not IPloneSiteRoot.providedBy(obj):
if (IFolderish.providedBy(obj) and obj_is_folderish = IFolderish.providedBy(obj)
not INonStructuralFolder.providedBy(obj)): obj_is_stuctural = not INonStructuralFolder.providedBy(obj)
if (obj_is_folderish and obj_is_stuctural):
flag = getattr(obj, 'allow_discussion', None) flag = getattr(obj, 'allow_discussion', None)
if flag is not None: if flag is not None:
return flag return flag