From f9801e184b671a5ebe60138dd7dcfdc38c6d35da Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Sat, 5 Oct 2013 11:03:47 +0200 Subject: [PATCH] unify state handling for concepts and resources on display and search --- browser/common.py | 6 +++--- expert/browser/search.py | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/browser/common.py b/browser/common.py index 782d700..18c6362 100644 --- a/browser/common.py +++ b/browser/common.py @@ -702,10 +702,10 @@ class BaseView(GenericView, I18NView): if not checkPermission(self.viewStatesPermission, self.context): return result if IResource.providedBy(self.target): - statesDefs = self.globalOptions('organize.stateful.resource', ()) + statesDefs = (self.globalOptions('organize.stateful.resource') or []) else: - statesDefs = ((self.globalOptions('organize.stateful.concept') or []) + - (self.typeOptions('organize.stateful') or [])) + statesDefs = (self.globalOptions('organize.stateful.concept') or []) + statesDefs += (self.typeOptions('organize.stateful') or []) for std in statesDefs: stf = component.getAdapter(self.target, IStateful, name=std) result.append(stf) diff --git a/expert/browser/search.py b/expert/browser/search.py index 1776e57..2120029 100644 --- a/expert/browser/search.py +++ b/expert/browser/search.py @@ -257,8 +257,6 @@ class Search(ConceptView): return self.viewIterator(result) def checkStates(self, obj): - if not IResource.providedBy(obj): - return True for std, states in self.selectedStates.items(): if std.startswith('state.resource.'): std = std[len('state.resource.'):]