From 21b379522727a7cfe7fa46d47f3a8d10c610ed73 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Thu, 8 Aug 2013 11:55:05 +0200 Subject: [PATCH] fix member registration: use correct form macro from loops/browser --- browser/common.py | 4 ++-- organize/browser/member.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/browser/common.py b/browser/common.py index 82c6d65..eb42fd8 100644 --- a/browser/common.py +++ b/browser/common.py @@ -704,8 +704,8 @@ class BaseView(GenericView, I18NView): if IResource.providedBy(self.target): statesDefs = self.globalOptions('organize.stateful.resource', ()) else: - statesDefs = (self.globalOptions('organize.stateful.concept', []) + - self.typeOptions('organize.stateful', [])) + statesDefs = ((self.globalOptions('organize.stateful.concept') or []) + + (self.typeOptions('organize.stateful') or [])) for std in statesDefs: stf = component.getAdapter(self.target, IStateful, name=std) result.append(stf) diff --git a/organize/browser/member.py b/organize/browser/member.py index 5916929..738b521 100644 --- a/organize/browser/member.py +++ b/organize/browser/member.py @@ -112,7 +112,8 @@ class BaseMemberRegistration(NodeView): @Lazy def macro(self): - return schema_macros.macros['form'] + #return schema_macros.macros['form'] + return organize_macros.macros['register'] def checkPermissions(self): personType = adapted(self.conceptManager['person'])