Skip to content

Commit

Permalink
Merge branch 'feed_item_form' of github.com:Xpirix/qgis-feed into fee…
Browse files Browse the repository at this point in the history
…d_form_review
  • Loading branch information
Xpirix committed Oct 25, 2023
2 parents 74b0d5d + 2e0969c commit be6e951
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ $ python manage.py test qgisfeed.tests.QgisFeedEntryTestCase
$ python manage.py test qgisfeed.tests.QgisUserVisitTestCase
$ python manage.py test qgisfeed.tests.LoginTestCase
$ python manage.py test qgisfeed.tests.FeedsItemFormTestCase
$ python manage.py test qgisfeed.tests.FeedsListViewTestCase
```

### Run test with docker
Expand Down
13 changes: 6 additions & 7 deletions qgisfeedproject/qgisfeed/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,13 @@ def feeds_list(request):

# Get sorting parameters from the query string
sort_by = request.GET.get('sort_by', 'publish_from')
order = request.GET.get('order', 'desc')
current_order = order
current_order = request.GET.get('order', 'desc')

if order == 'asc':
if current_order == 'asc':
feeds_entry = feeds_entry.order_by(sort_by)
order = 'desc'
next_order = 'desc'
else:
order = 'asc'
next_order = 'asc'
feeds_entry = feeds_entry.order_by(f'-{sort_by}')

# Get the count of all/filtered entries
Expand All @@ -173,7 +172,7 @@ def feeds_list(request):
{
"feeds_entry": feeds_entry,
"sort_by": sort_by,
"order": order,
"order": next_order,
"current_order":current_order,
"form": form,
"count": count
Expand Down Expand Up @@ -237,4 +236,4 @@ def feed_entry_update(request, pk):
"success": success,

}
return render(request, 'feeds/feed_item_form.html', args)
return render(request, 'feeds/feed_item_form.html', args)

0 comments on commit be6e951

Please sign in to comment.