From 5d4a74c528e0c4a7e512f8faeb5e4f922fe52938 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 20 Apr 2015 10:12:29 +0200 Subject: [PATCH] allow suppression for listing all institutions for workgroup admin, e.g. for surveys --- knowledge/browser.py | 7 +++++-- knowledge/survey/browser.py | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/knowledge/browser.py b/knowledge/browser.py index 459863c..8eb8645 100644 --- a/knowledge/browser.py +++ b/knowledge/browser.py @@ -78,14 +78,17 @@ class InstitutionMixin(object): knowledge_macros = knowledge_macros + adminMaySelectAllInstitutions = True + @Lazy def institutionType(self): return self.conceptManager['institution'] @Lazy def institutions(self): - if checkPermission('loops.ManageWorkspaces', self.context): - return self.getAllInstitutions() + if self.adminMaySelectAllInstitutions: + if checkPermission('loops.ManageWorkspaces', self.context): + return self.getAllInstitutions() result = [] p = getPersonForUser(self.context, self.request) if p is None: diff --git a/knowledge/survey/browser.py b/knowledge/survey/browser.py index 09286ef..c3a99e8 100644 --- a/knowledge/survey/browser.py +++ b/knowledge/survey/browser.py @@ -50,6 +50,8 @@ class SurveyView(InstitutionMixin, ConceptView): template = template + adminMaySelectAllInstitutions = False + @Lazy def macro(self): self.registerDojo()