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

Merge branch 'marietje-zuid' into 'marietje-zuid'

Browse Source 
queue/request: include length in request list

See merge request dsprenkels/MarietjeDjango!1
This commit is contained in:
Daan Sprenkels
2018-11-23 15:31:41 +01:00
parent 2a2316fb40 66ca91f128
commit c160ab12ce
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
marietje/marietje/static/js/queue.js
View File

@ -267,7 +267,7 @@ function getSongs()
$.each(songs, function (id, song) { $.each(songs, function (id, song) {
var artist = song.artist.trim() === '' ? '?' : song.artist; var artist = song.artist.trim() === '' ? '?' : song.artist;
var title = song.title.trim() === '' ? '?' : song.title; var title = song.title.trim() === '' ? '?' : song.title;
$('#request-table tbody:last-child').append('<tr><td>' + artist + '</td><td><a href="#" data-song-id="' + song.id + '">' + title + '</a></td><td>' + (song.uploader_name ? song.uploader_name : 'Marietje') + '</td></tr>'); $('#request-table tbody:last-child').append('<tr><td>' + artist + '</td><td><a href="#" data-song-id="' + song.id + '">' + title + '</a></td><td>' + (song.uploader_name ? song.uploader_name : 'Marietje') + '</td><td>' + song.duration.secondsToHHMMSS() + '</td></tr>');
}); });
var pageNumSelect = $('.pagenum'); var pageNumSelect = $('.pagenum');
pageNumSelect.empty(); pageNumSelect.empty();

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

@ -14,6 +14,7 @@
<th>Artist</th> <th>Artist</th>
<th>Title</th> <th>Title</th>
<th>Uploader</th> <th>Uploader</th>
<th>Length</th>
</tr> </tr>
<tr> <tr>
<th colspan="2"><input id="search-all" class="search-input" type="text"></th> <th colspan="2"><input id="search-all" class="search-input" type="text"></th>