diff --git a/base.py b/base.py index 6256733..4e6aef2 100644 --- a/base.py +++ b/base.py @@ -51,6 +51,10 @@ class Loops(Folder): def setSkinName(self, skinName): self._skinName = skinName skinName = property(getSkinName, setSkinName) + def getOptions(self): return getattr(self, '_options', []) + def setOptions(self, value): self._options = value + options = property(getOptions, setOptions) + def getLoopsRoot(self): return self diff --git a/browser/common.py b/browser/common.py index 7bca5f7..43a0637 100644 --- a/browser/common.py +++ b/browser/common.py @@ -97,6 +97,7 @@ class BaseView(GenericView): self.setSkin(self.loopsRoot.skinName) try: if not canAccess(context, 'title'): + #raise Unauthorized request.response.redirect('login.html') except ForbiddenAttribute: # ignore when testing pass @@ -246,6 +247,14 @@ class BaseView(GenericView): # versioning + @Lazy + def useVersioning(self): + if 'useVersioning' in self.loopsRoot.options: + return True + options = getattr(self.controller, 'options', None) + if options: + return 'useVersioning' in options.value + @Lazy def versionId(self): context = self.context @@ -260,6 +269,8 @@ class BaseView(GenericView): @Lazy def versionInfo(self): + if not self.useVersioning: + return None context = self.context versionable = IVersionable(context, None) if versionable is None: diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt index 74d805a..9bac39c 100644 --- a/browser/concept_macros.pt +++ b/browser/concept_macros.pt @@ -87,7 +87,8 @@