Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve the issue of proposals not being ordered in the selected proposals listing #805

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ Contributing
2. Report any bugs/feature request as Github [new issue][new-issue], if it's already not present.
3. If you are starting to work on an issue, please leave a comment saying "I am working on it".
4. You can set up the project using the [Getting Started][getting-started] guide.
<!-- on cloning must be install manually this lib .
->wheel
->pg config
->uwsgi
->update pip
-->
5. Once you are done with feature/bug fix, send a pull request according to the [guidelines][guidelines].

[issue-list]: https://github.com/pythonindia/junction/issues/
Expand Down
12 changes: 11 additions & 1 deletion junction/proposals/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,15 @@ def _filter_proposals(request, proposals_qs):
return is_filtered, filter_name, proposals_qs



if proposal_type_filter:
proposals_qs = proposals_qs.filter(proposal_type=proposal_type_filter)
is_filtered = True
filter_name = proposal_type_filter

return is_filtered, filter_name, proposals_qs


@require_http_methods(["GET"])
def list_proposals(request, conference_slug):
conference = get_object_or_404(Conference, slug=conference_slug)
Expand All @@ -104,7 +113,7 @@ def list_proposals(request, conference_slug):
# make sure it's after the tag filtering is applied
selected_proposals_list = proposals_qs.filter(
review_status=ProposalReviewStatus.SELECTED
)
).order_by('created_at') # Add order_by here to order by the desired field

selected_proposals = collections.defaultdict(list)
for proposal in selected_proposals_list:
Expand Down Expand Up @@ -138,6 +147,7 @@ def list_proposals(request, conference_slug):
)



@login_required
@require_http_methods(["GET", "POST"])
def create_proposal(request, conference_slug):
Expand Down