technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-10 05:22:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/sort-artist-title' into 'marietje-zuid'

Browse Source 
Sort tracks based on artist, then on title

Closes #57 and #55

See merge request technicie/MarietjeDjango!72
This commit is contained in:
Kees van Kempen
2023-10-11 15:26:00 +02:00
parent c061d1c304 63cc1a8fe0
commit d19a115bbe
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
marietje/queues/templates/queues/queue.html
View File

@ -436,7 +436,7 @@
}, },
created() { created() {
fetch( fetch(
`/api/v1/songs/?ordering=title&limit=${this.page_size}&offset=${this.page_size * (this.page_number - 1)}` `/api/v1/songs/?ordering=artist,title&limit=${this.page_size}&offset=${this.page_size * (this.page_number - 1)}`
).then(response => { ).then(response => {
if (response.status === 200) { if (response.status === 200) {
return response.json(); return response.json();
@ -459,7 +459,7 @@
methods: { methods: {
search() { search() {
fetch( fetch(
`/api/v1/songs/?ordering=title&limit=${this.page_size}&offset=${this.page_size * (this.page_number - 1)}&search=${this.search_input}`, `/api/v1/songs/?ordering=artist,title&limit=${this.page_size}&offset=${this.page_size * (this.page_number - 1)}&search=${this.search_input}`,
{ {
headers: { headers: {
"X-CSRFToken": CSRF_TOKEN, "X-CSRFToken": CSRF_TOKEN,

4
marietje/songs/templates/songs/manage.html
View File

@ -112,7 +112,7 @@
}, },
created() { created() {
fetch( fetch(
`/api/v1/songs/?ordering=title&limit=${this.page_size}&offset=${this.page_size * (this.page_number - 1)}` `/api/v1/songs/?ordering=artist,title&limit=${this.page_size}&offset=${this.page_size * (this.page_number - 1)}`
).then(response => { ).then(response => {
if (response.status === 200) { if (response.status === 200) {
return response.json(); return response.json();
@ -139,7 +139,7 @@
}, },
refresh() { refresh() {
fetch( fetch(
`/api/v1/songs/?ordering=title&limit=${this.page_size}&offset=${this.page_size * (this.page_number - 1)}&search=${this.search_input}`, `/api/v1/songs/?ordering=artist,title&limit=${this.page_size}&offset=${this.page_size * (this.page_number - 1)}&search=${this.search_input}`,
{ {
headers: { headers: {
"X-CSRFToken": CSRF_TOKEN, "X-CSRFToken": CSRF_TOKEN,