Revision bfaeedb6
b/snf-astakos-app/astakos/im/forms.py | ||
---|---|---|
835 | 835 |
) |
836 | 836 |
|
837 | 837 |
class MembersSortForm(forms.Form): |
838 |
sort_by = forms.ChoiceField(label='Sort by', |
|
839 |
choices=(('person__email', 'User Id'), |
|
840 |
('person__first_name', 'Name'), |
|
841 |
('date_joined', 'Status') |
|
842 |
), |
|
843 |
required=False) |
|
838 |
sorting = forms.ChoiceField( |
|
839 |
label='Sort by', |
|
840 |
choices=(('person__email', 'User Id'), |
|
841 |
('person__first_name', 'Name'), |
|
842 |
('date_joined', 'Status') |
|
843 |
), |
|
844 |
required=True |
|
845 |
) |
|
844 | 846 |
|
845 | 847 |
class PickResourceForm(forms.Form): |
846 | 848 |
resource = forms.ModelChoiceField( |
b/snf-astakos-app/astakos/im/views.py | ||
---|---|---|
1022 | 1022 |
}, context_processors) |
1023 | 1023 |
|
1024 | 1024 |
# validate sorting |
1025 |
sorting = request.GET.get('sorting') |
|
1026 |
if sorting: |
|
1027 |
form = MembersSortForm({'sort_by': sorting}) |
|
1028 |
if form.is_valid(): |
|
1029 |
sorting = form.cleaned_data.get('sort_by') |
|
1030 |
|
|
1031 |
else: |
|
1032 |
form = MembersSortForm({'sort_by': 'person_first_name'}) |
|
1033 |
|
|
1025 |
sorting = 'person__email' |
|
1026 |
form = MembersSortForm(request.GET) |
|
1027 |
if form.is_valid(): |
|
1028 |
sorting = form.cleaned_data.get('sorting') |
|
1029 |
|
|
1034 | 1030 |
result = callpoint.list_resources() |
1035 | 1031 |
resource_catalog = ResourcePresentation(RESOURCES_PRESENTATION_DATA) |
1036 | 1032 |
resource_catalog.update_from_result(result) |
Also available in: Unified diff