diff -r 1d09147de51f -r 580b1c21b808 app/soc/views/models/role.py --- a/app/soc/views/models/role.py Sat Nov 29 21:04:09 2008 +0000 +++ b/app/soc/views/models/role.py Sat Nov 29 21:21:04 2008 +0000 @@ -34,6 +34,7 @@ from soc.logic.models import user as user_logic from soc.views import helper from soc.views import out_of_band +from soc.views.helper import access from soc.views.models import base from soc.views.models import user as user_view @@ -73,16 +74,13 @@ DEF_INVITE_INSTRUCTION_MSG_FMT = ugettext_lazy( 'Please use this form to invite someone to become a %(name)s.') - def __init__(self, original_params=None): + def __init__(self, params=None): """ Args: original_params: This dictionary should be filled with the parameters """ - params = {} - params = dicts.merge(original_params, params) - base.View.__init__(self, params=params) def invite(self, request, page_name=None, params=None, **kwargs): @@ -102,7 +100,7 @@ params = dicts.merge(new_params, user_view.view._params) try: - self.checkAccess('invite', request) + access.checkAccess('invite', request, rights=params['rights']) except out_of_band.Error, error: return error.response(request) @@ -123,13 +121,15 @@ """See base.View.getDjangoURLPatterns(). """ - params = {} default_patterns = self._params['django_patterns_defaults'] default_patterns += [ (r'^%(url_name)s/invite/%(lnp)s$', 'soc.views.models.%s.invite', 'Invite %(name_short)s')] + params = {} params['django_patterns_defaults'] = default_patterns + + params = dicts.merge(params, self._params) patterns = super(RoleView, self).getDjangoURLPatterns(params) return patterns