equal
deleted
inserted
replaced
28 from soc.logic import dicts |
28 from soc.logic import dicts |
29 from soc.logic.models import user as user_logic |
29 from soc.logic.models import user as user_logic |
30 from soc.views import helper |
30 from soc.views import helper |
31 from soc.views import out_of_band |
31 from soc.views import out_of_band |
32 from soc.views.helper import access |
32 from soc.views.helper import access |
|
33 from soc.views.helper import decorators |
33 from soc.views.helper import redirects |
34 from soc.views.helper import redirects |
34 from soc.views.models import base |
35 from soc.views.models import base |
35 from soc.views.models import user as user_view |
36 from soc.views.models import user as user_view |
36 |
37 |
37 import soc.models.request |
38 import soc.models.request |
91 params = dicts.merge(params, new_params) |
92 params = dicts.merge(params, new_params) |
92 |
93 |
93 super(View, self).__init__(params=params) |
94 super(View, self).__init__(params=params) |
94 |
95 |
95 def invite(self, request, access_type, |
96 def invite(self, request, access_type, |
96 page_name=None, params=None, **kwargs): |
97 page_name=None, params=None, *args, **kwargs): |
97 """Displays the request promotion to Role page. |
98 """Displays the request promotion to Role page. |
98 """ |
99 """ |
99 |
100 |
100 new_params = {} |
101 new_params = {} |
101 |
102 |
108 self.DEF_INVITE_INSTRUCTION_MSG_FMT % self._params |
109 self.DEF_INVITE_INSTRUCTION_MSG_FMT % self._params |
109 new_params['logic'] = user_logic.logic |
110 new_params['logic'] = user_logic.logic |
110 |
111 |
111 new_params = dicts.merge(params, new_params) |
112 new_params = dicts.merge(params, new_params) |
112 params = dicts.merge(new_params, user_view.view._params) |
113 params = dicts.merge(new_params, user_view.view._params) |
|
114 rights = params['rights'] |
113 |
115 |
114 try: |
116 try: |
115 access.checkAccess(access_type, request, rights=params['rights']) |
117 access.checkAccess(access_type, request, rights, args, kwargs) |
116 except out_of_band.Error, error: |
118 except out_of_band.Error, error: |
117 return helper.responses.errorResponse(error, request) |
119 return helper.responses.errorResponse(error, request) |
118 |
120 |
119 content = helper.lists.getListContent(request, params) |
121 content = helper.lists.getListContent(request, params) |
120 contents = [content] |
122 contents = [content] |