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

CC-3329: Library: Add "track number" to the list of available columns to show (was in 1.9, disappeared in 2.0)

Browse source 
- updated the view columns to include track_number from db as track
- updated sql query to include track_number from db
This commit is contained in:
Daniel 2012-02-15 11:21:21 -05:00
parent 14a9225b97
commit 190490d6f4
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
airtime_mvc/application/models/StoredFile.php
View file

@ -583,7 +583,7 @@ class Application_Model_StoredFile {
{ {
global $CC_CONFIG; global $CC_CONFIG;
$displayData = array("track_title", "artist_name", "album_title", "genre", "length", "year", "utime", "mtime", "ftype"); $displayData = array("track_title", "artist_name", "album_title", "genre", "length", "year", "utime", "mtime", "ftype", "track_number");
$plSelect = "SELECT "; $plSelect = "SELECT ";
$fileSelect = "SELECT "; $fileSelect = "SELECT ";
@ -610,6 +610,9 @@ 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.", ";
@ -621,10 +624,11 @@ class Application_Model_StoredFile {
UNION UNION
(".$fileSelect."id FROM ".$CC_CONFIG["filesTable"]." AS FILES WHERE file_exists = 'TRUE')) AS RESULTS"; (".$fileSelect."id FROM ".$CC_CONFIG["filesTable"]." AS FILES WHERE file_exists = 'TRUE')) AS RESULTS";
$results = Application_Model_StoredFile::searchFiles($fromTable, $datatables); $results = Application_Model_StoredFile::searchFiles($fromTable, $datatables);
foreach($results['aaData'] as &$row){ foreach($results['aaData'] as &$row){
$row['id'] = intval($row['id']); $row['id'] = intval($row['id']);
//$length = new DateTime($row['length']); //$length = new DateTime($row['length']);
@ -733,6 +737,7 @@ class Application_Model_StoredFile {
$sql = $selectorRows." FROM ".$fromTable." ORDER BY ".$orderby." OFFSET ".$data["iDisplayStart"]." LIMIT ".$data["iDisplayLength"]; $sql = $selectorRows." FROM ".$fromTable." ORDER BY ".$orderby." OFFSET ".$data["iDisplayStart"]." LIMIT ".$data["iDisplayLength"];
} }
//display sql executed in airtime log for testing
//Logging::log($sql); //Logging::log($sql);
$results = $CC_DBC->getAll($sql); $results = $CC_DBC->getAll($sql);

5
airtime_mvc/public/js/airtime/library/library.js
View file

@ -309,7 +309,8 @@ function createDataTable(data) {
/* Year */ {"sTitle": "Year", "sName": "year", "mDataProp": "year", "sClass": "library_year"}, /* Year */ {"sTitle": "Year", "sName": "year", "mDataProp": "year", "sClass": "library_year"},
/* 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"}
], ],
"aaSorting": [[2,'asc']], "aaSorting": [[2,'asc']],
"sPaginationType": "full_numbers", "sPaginationType": "full_numbers",
@ -358,7 +359,7 @@ function createDataTable(data) {
"oColReorder": { "oColReorder": {
"iFixedColumns": 2, "iFixedColumns": 2,
"aiOrder": [ 0,1,2,3,4,5,6,7,8,9 ] "aiOrder": [ 0,1,2,3,4,5,6,7,8,9,10 ]
} }
}); });