equal
deleted
inserted
replaced
55 """ |
55 """ |
56 |
56 |
57 new_params = {} |
57 new_params = {} |
58 |
58 |
59 new_params['extra_dynaexclude'] = ['founder','home', 'tos', |
59 new_params['extra_dynaexclude'] = ['founder','home', 'tos', |
60 'member_template', 'state'] |
60 'member_template', 'status'] |
61 new_params['edit_extra_dynafields'] = { |
61 new_params['edit_extra_dynafields'] = { |
62 'founded_by': forms.CharField(widget=widgets.ReadOnlyInput(), |
62 'founded_by': forms.CharField(widget=widgets.ReadOnlyInput(), |
63 required=False), |
63 required=False), |
64 } |
64 } |
65 |
65 |
134 |
134 |
135 # list all incoming requests |
135 # list all incoming requests |
136 filter = { |
136 filter = { |
137 'scope': group_entity, |
137 'scope': group_entity, |
138 'role': role_names, |
138 'role': role_names, |
139 'state': 'new' |
139 'status': 'new' |
140 } |
140 } |
141 |
141 |
142 # create the list parameters |
142 # create the list parameters |
143 inc_req_params = request_view.getParams() |
143 inc_req_params = request_view.getParams() |
144 |
144 |
152 |
152 |
153 # list all outstanding invites |
153 # list all outstanding invites |
154 filter = { |
154 filter = { |
155 'scope': group_entity, |
155 'scope': group_entity, |
156 'role': role_names, |
156 'role': role_names, |
157 'state': 'group_accepted' |
157 'status': 'group_accepted' |
158 } |
158 } |
159 |
159 |
160 # create the list parameters |
160 # create the list parameters |
161 out_inv_params = request_view.getParams() |
161 out_inv_params = request_view.getParams() |
162 |
162 |
170 |
170 |
171 # list all ignored requests |
171 # list all ignored requests |
172 filter = { |
172 filter = { |
173 'scope': group_entity, |
173 'scope': group_entity, |
174 'role': role_names, |
174 'role': role_names, |
175 'state': 'ignored' |
175 'status': 'ignored' |
176 } |
176 } |
177 |
177 |
178 # create the list parameters |
178 # create the list parameters |
179 ignored_params = request_view.getParams() |
179 ignored_params = request_view.getParams() |
180 |
180 |
214 group_entity = group_logic.getFromFields(**kwargs) |
214 group_entity = group_logic.getFromFields(**kwargs) |
215 |
215 |
216 # create the filter |
216 # create the filter |
217 filter = { |
217 filter = { |
218 'scope' : group_entity, |
218 'scope' : group_entity, |
219 'state': 'active' |
219 'status': 'active' |
220 } |
220 } |
221 |
221 |
222 role_views = params['role_views'] |
222 role_views = params['role_views'] |
223 contents = [] |
223 contents = [] |
224 index = 0 |
224 index = 0 |
269 params = dicts.merge(params, self._params) |
269 params = dicts.merge(params, self._params) |
270 logic = params['logic'] |
270 logic = params['logic'] |
271 |
271 |
272 # set fields to match every active role this user has |
272 # set fields to match every active role this user has |
273 fields = {'user': user, |
273 fields = {'user': user, |
274 'state': 'active'} |
274 'status': 'active'} |
275 |
275 |
276 # get the role views and start filling group_entities |
276 # get the role views and start filling group_entities |
277 role_views = self._params['role_views'] |
277 role_views = self._params['role_views'] |
278 role_descriptions = {} |
278 role_descriptions = {} |
279 |
279 |