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

CC-4264: Smart Block: Fail to generate block with some unavailable files 

- fixed
This commit is contained in:
James 2012-08-24 17:02:37 -04:00
parent c561f36aa1
commit 2ca4a369b2
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,13 +430,16 @@ EOT;
foreach ($p_items as $ac) { foreach ($p_items as $ac) {
Logging::info("Adding audio file {$ac}"); Logging::info("Adding audio file {$ac}");
try {
if (is_array($ac) && $ac[1] == 'audioclip') { if (is_array($ac) && $ac[1] == 'audioclip') {
$res = $this->insertBlockElement($this->buildEntry($ac[0], $pos)); $res = $this->insertBlockElement($this->buildEntry($ac[0], $pos));
$pos = $pos + 1; $pos = $pos + 1;
} elseif (!is_array($ac)) { } elseif (!is_array($ac)) {
$res = $this->insertBlockElement($this->buildEntry($ac, $pos)); $res = $this->insertBlockElement($this->buildEntry($ac, $pos));
$pos = $pos + 1; $pos = $pos + 1;
}
} catch (Exception $e) {
Logging::log($e->getMessage());
} }
} }
@ -1223,8 +1226,8 @@ EOT;
$limits['time'] = 1440 * 60; $limits['time'] = 1440 * 60;
$limits['items'] = $storedCrit['limit']['value']; $limits['items'] = $storedCrit['limit']['value'];
} else { } else {
$limits['time'] = $storedCrit['limit']['modifier'] == "hours" ? $limits['time'] = $storedCrit['limit']['modifier'] == "hours" ?
intval(floatval($storedCrit['limit']['value']) * 60 * 60) : intval(floatval($storedCrit['limit']['value']) * 60 * 60) :
intval($storedCrit['limit']['value'] * 60); intval($storedCrit['limit']['value'] * 60);
$limits['items'] = null; $limits['items'] = null;
} }

3
airtime_mvc/application/views/scripts/library/library.phtml
View File

@ -1,5 +1,4 @@
<div id="import_status" class="library_import" style="display:none">File import in progress... <img src="/css/images/file_import_loader.gif"></img></div> <div id="import_status" class="library_import" style="display:none">File import in progress... <img src="/css/images/file_import_loader.gif"></img></div>
<div id="advanced_search"> <div id="advanced_search"></div>
</div>
<table id="library_display" cellpadding="0" cellspacing="0" class="datatable"> <table id="library_display" cellpadding="0" cellspacing="0" class="datatable">
</table> </table>