# HG changeset patch # User Sverre Rabbelier # Date 1228564385 0 # Node ID 0158b11cbf6d083778748377e83e84042139caf0 # Parent 2433d5c1d7e6b24830d734a3b0d446e8e7ff3bcc More DI on scope_logic Patch by: Sverre Rabbelier diff -r 2433d5c1d7e6 -r 0158b11cbf6d app/soc/logic/models/group.py --- a/app/soc/logic/models/group.py Sat Dec 06 11:31:08 2008 +0000 +++ b/app/soc/logic/models/group.py Sat Dec 06 11:53:05 2008 +0000 @@ -31,11 +31,13 @@ """Logic methods for the Group model. """ - def __init__(self, model=soc.models.group.Group, base_model=None): + def __init__(self, model=soc.models.group.Group, + base_model=None, scope_logic=None): """Defines the name, key_name and model for this entity. """ - super(Logic, self).__init__(model, base_model=base_model) + super(Logic, self).__init__(model, base_model=base_model, + scope_logic=scope_logic) def getKeyValues(self, entity): """Extracts the key values from entity and returns them. diff -r 2433d5c1d7e6 -r 0158b11cbf6d app/soc/logic/models/presence.py --- a/app/soc/logic/models/presence.py Sat Dec 06 11:31:08 2008 +0000 +++ b/app/soc/logic/models/presence.py Sat Dec 06 11:53:05 2008 +0000 @@ -33,11 +33,12 @@ """ def __init__(self, model=soc.models.presence.Presence, - base_model=None): + base_model=None, scope_logic=None): """Defines the name, key_name and model for this entity. """ - super(Logic, self).__init__(model, base_model=base_model) + super(Logic, self).__init__(model, base_model=base_model, + scope_logic=scope_logic) logic = Logic() diff -r 2433d5c1d7e6 -r 0158b11cbf6d app/soc/logic/models/request.py --- a/app/soc/logic/models/request.py Sat Dec 06 11:31:08 2008 +0000 +++ b/app/soc/logic/models/request.py Sat Dec 06 11:53:05 2008 +0000 @@ -18,7 +18,7 @@ """ __authors__ = [ - '"Sverre Rabbelier" ', + '"Sverre Rabbelier" ', '"Lennard de Rijk" ' ] @@ -26,6 +26,7 @@ from soc.logic.helper import notifications from soc.logic.models import base +from soc.logic.models import sponsor as sponsor_logic class Logic(base.Logic): @@ -33,11 +34,12 @@ """ def __init__(self, model=soc.models.request.Request, - base_model=None): + base_model=None, scope_logic=sponsor_logic): """Defines the name, key_name and model for this entity. """ - super(Logic, self).__init__(model, base_model=base_model) + super(Logic, self).__init__(model, base_model=base_model, + scope_logic=scope_logic) def getKeyValues(self, entity): """See base.Logic.getKeyNameValues.