Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-3174 : showbuilder 

fix ordering problem with track column.
This commit is contained in:
Naomi Aro 2012-02-20 11:41:44 +01:00
parent 44dccf15ce
commit 17c3cdcfb2
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
airtime_mvc/application/models/StoredFile.php
View File

@ -579,8 +579,7 @@ class Application_Model_StoredFile {
return $runtime; return $runtime;
} }
public static function searchFilesForPlaylistBuilder($datatables) public static function searchFilesForPlaylistBuilder($datatables) {
{
global $CC_CONFIG; global $CC_CONFIG;
$displayData = array("track_title", "artist_name", "album_title", "genre", "length", "year", "utime", "mtime", "ftype", "track_number"); $displayData = array("track_title", "artist_name", "album_title", "genre", "length", "year", "utime", "mtime", "ftype", "track_number");
@ -610,9 +609,6 @@ class Application_Model_StoredFile {
} else if ($key === "mtime") { } else if ($key === "mtime") {
$plSelect .= $key.", "; $plSelect .= $key.", ";
$fileSelect .= $key.", "; $fileSelect .= $key.", ";
} else if ($key === "track_number") {
$plSelect .= "NULL AS ".$key.", ";
$fileSelect .= $key.", ";
} else { } else {
$plSelect .= "NULL AS ".$key.", "; $plSelect .= "NULL AS ".$key.", ";
$fileSelect .= $key.", "; $fileSelect .= $key.", ";
@ -738,7 +734,7 @@ class Application_Model_StoredFile {
} }
//display sql executed in airtime log for testing //display sql executed in airtime log for testing
//Logging::log($sql); Logging::log($sql);
$results = $CC_DBC->getAll($sql); $results = $CC_DBC->getAll($sql);

2
airtime_mvc/public/js/airtime/library/library.js
View File

@ -310,7 +310,7 @@ function createDataTable(data) {
/* Length */ {"sTitle": "Length", "sName": "length", "mDataProp": "length", "sClass": "library_length"}, /* Length */ {"sTitle": "Length", "sName": "length", "mDataProp": "length", "sClass": "library_length"},
/* Upload Time */ {"sTitle": "Uploaded", "sName": "utime", "mDataProp": "utime", "sClass": "library_upload_time"}, /* Upload Time */ {"sTitle": "Uploaded", "sName": "utime", "mDataProp": "utime", "sClass": "library_upload_time"},
/* Last Modified */ {"sTitle": "Last Modified", "sName": "mtime", "bVisible": false, "mDataProp": "mtime", "sClass": "library_modified_time"}, /* Last Modified */ {"sTitle": "Last Modified", "sName": "mtime", "bVisible": false, "mDataProp": "mtime", "sClass": "library_modified_time"},
/* Track Number */ {"sTitle": "Track", "sName": "track", "bSearchable": false, "bVisible": false, "mDataProp": "track_number", "sClass": "library_track"} /* Track Number */ {"sTitle": "Track", "sName": "track_number", "bSearchable": false, "bVisible": false, "mDataProp": "track_number", "sClass": "library_track"}
], ],
"aaSorting": [[2,'asc']], "aaSorting": [[2,'asc']],
"sPaginationType": "full_numbers", "sPaginationType": "full_numbers",