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

CC-2283: Now playing bar only shows the first word of the show name

Browse source 
-fixed
This commit is contained in:
martin 2011-05-18 18:37:13 -04:00
parent 37bfb53b3a
commit d6616004a6
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/models/Nowplaying.php
View file

@ -4,7 +4,7 @@ class Application_Model_Nowplaying
{ {
public static function CreateHeaderRow($p_showName, $p_showStart, $p_showEnd){ public static function CreateHeaderRow($p_showName, $p_showStart, $p_showEnd){
return array("h", $p_showName, $p_showStart, $p_showEnd, "", "", "", "", "", "", ""); return array("h", "", $p_showStart, $p_showEnd, $p_showName, "", "", "", "", "", "");
} }
public static function CreateDatatableRows($p_dbRows){ public static function CreateDatatableRows($p_dbRows){
@ -30,11 +30,11 @@ class Application_Model_Nowplaying
} }
public static function CreateGapRow($p_gapTime){ public static function CreateGapRow($p_gapTime){
return array("g", $p_gapTime, "", "", "", "", "", "", "", "", ""); return array("g", "", "", "", $p_gapTime, "", "", "", "", "", "");
} }
public static function CreateRecordingRow($p_showInstance){ public static function CreateRecordingRow($p_showInstance){
return array("r", $p_showInstance->getName(), "", "", "", "", "", "", "", "", ""); return array("r", "", "", "", $p_showInstance->getName(), "", "", "", "", "", "");
} }
public static function GetDataGridData($viewType, $dateString){ public static function GetDataGridData($viewType, $dateString){

6
airtime_mvc/public/js/airtime/nowplaying/nowplayingdatagrid.js
View file

@ -155,7 +155,7 @@ function createDataGrid(){
if ( sType.indexOf("h") != -1 ){ if ( sType.indexOf("h") != -1 ){
//show header row found //show header row found
var showName = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[1]; var showName = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[4];
var startTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[2]; var startTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[2];
var endTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[3]; var endTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[3];
@ -169,7 +169,7 @@ function createDataGrid(){
} else if ( sType.indexOf("g") != -1 ){ } else if ( sType.indexOf("g") != -1 ){
//gap row found //gap row found
var gapTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[1]; var gapTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[4];
var nGroup = document.createElement('tr'); var nGroup = document.createElement('tr');
var nCell = document.createElement('td'); var nCell = document.createElement('td');
@ -181,7 +181,7 @@ function createDataGrid(){
} else if ( sType.indexOf("r") != -1 ){ } else if ( sType.indexOf("r") != -1 ){
//gap row found //gap row found
var showName = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[1]; var showName = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[4];
var nGroup = document.createElement('tr'); var nGroup = document.createElement('tr');
var nCell = document.createElement('td'); var nCell = document.createElement('td');