corbz/PYRSS-Website
corbz/PYRSS-Website
1
0
Fork 0
Code Issues 21 Pull Requests Actions Releases 1 Wiki Activity

ordering fix
All checks were successful
Build and Push Docker Image / build (push) Successful in 1m22s
Details

Browse Source
This commit is contained in:
Corban-Lee Jones 2024-09-11 16:47:41 +01:00
parent 12f99a3d15
commit bbaca1e648
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -6,6 +6,8 @@
- Enhancement: Improved the offcanvas navbar on smaller screens, to be less ugly - Enhancement: Improved the offcanvas navbar on smaller screens, to be less ugly
- Fix: Select2 dropdown search bars always using light theme, regardless of user choice - Fix: Select2 dropdown search bars always using light theme, regardless of user choice
- Enhancement: Clearer help label on the 'Add Server' modal/form - Enhancement: Clearer help label on the 'Add Server' modal/form
- Enhancement: Add wiki link button to footer
- Fix: "ordering=unknown" by only applying ordering if it's truthy
- -
- TODO: fix areas marked `// FIX: potential xss attack` - TODO: fix areas marked `// FIX: potential xss attack`
- -

9
apps/static/js/api.js
View File

@ -28,7 +28,8 @@ function makeQuerystring(filters, sort) {
for (key in filters) { for (key in filters) {
querystring += `${key}=${filters[key]}&`; querystring += `${key}=${filters[key]}&`;
} }
return querystring += `ordering=${sort}`;
return sort ? querystring += `ordering=${sort}` : querystring;
} }
// Saved Guilds // Saved Guilds
@ -64,8 +65,7 @@ async function loadChannels(guildId) {
async function getSubscriptions(filters, sort) { async function getSubscriptions(filters, sort) {
let querystring = makeQuerystring(filters, sort); let querystring = makeQuerystring(filters, sort);
url = `/api/subscription/${querystring}`; return await ajaxRequest(`/api/subscription/${querystring}`, "GET");
return await ajaxRequest(url, "GET");
} }
async function getSubscription(id) { async function getSubscription(id) {
@ -116,8 +116,7 @@ async function deleteSubChannels(subscriptionId) {
async function getFilters(filters, sort) { async function getFilters(filters, sort) {
let querystring = makeQuerystring(filters, sort); let querystring = makeQuerystring(filters, sort);
url = `/api/filter/${querystring}`; return await ajaxRequest(`/api/filter/${querystring}`, "GET");
return await ajaxRequest(url, "GET");
} }
async function getFilter(id) { async function getFilter(id) {