Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2012-08-02 17:17:52 -04:00
parent 2a7c5eef64 82970c6e73
commit d18acfdc75
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/Block.php
View File

@ -279,7 +279,7 @@ EOT;
if ($modifier == "minutes") { if ($modifier == "minutes") {
$length = "00:".$value.":00"; $length = "00:".$value.":00";
} else if ($modifier == "hours") { } else if ($modifier == "hours") {
$length = $value."00:00"; $length = $value.":00:00";
} }
} }
return $length; return $length;

5
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -366,8 +366,11 @@ var AIRTIME = (function(AIRTIME){
var isStatic = data.isStatic; var isStatic = data.isStatic;
delete data.type; delete data.type;
if (isStatic) { if (isStatic) {
console.log(data);
$.each(data, function(index, ele){ $.each(data, function(index, ele){
$html += "<div>"+ele.track_title+" "+ele.creator+" "+ele.length+"</div>"; if (ele.track_title !== undefined) {
$html += "<div>"+ele.track_title+" "+ele.creator+" "+ele.length+"</div>";
}
}) })
} else { } else {
for (var key in data.crit){ for (var key in data.crit){