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

CC-4186: Playlist Builder -> Smart Playlist : The static Smart Playlist's length value will be empty if no file meet the criteria. 

- fixed
This commit is contained in:
James 2012-08-09 14:12:30 -04:00
parent 825abca61b
commit ef0e800c92
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -883,6 +883,7 @@ EOT;
public function deleteAllFilesFromBlock() public function deleteAllFilesFromBlock()
{ {
CcBlockcontentsQuery::create()->findByDbBlockId($this->id)->delete(); CcBlockcontentsQuery::create()->findByDbBlockId($this->id)->delete();
$this->block->reload();
} }
// smart block functions start // smart block functions start

4
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View File

@ -17,10 +17,10 @@ if (isset($this->obj)) {
<input id="obj_lastMod" type="hidden" value="<?php echo $this->obj->getLastModified('U'); ?>"></input> <input id="obj_lastMod" type="hidden" value="<?php echo $this->obj->getLastModified('U'); ?>"></input>
<input id='obj_type' type='hidden' value='playlist'></input> <input id='obj_type' type='hidden' value='playlist'></input>
<div class="playlist_title"> <div class="playlist_title">
<h3 id="spl_name"> <h3 id="obj_name">
<a id="playlist_name_display" contenteditable="true"><?php echo $this->obj->getName(); ?></a> <a id="playlist_name_display" contenteditable="true"><?php echo $this->obj->getName(); ?></a>
</h3> </h3>
<h4 id="spl_length"><?php echo $this->length; ?></h4> <h4 id="obj_length"><?php echo $this->length; ?></h4>
</div> </div>
<fieldset class="toggle closed" id="fieldset-metadate_change"> <fieldset class="toggle closed" id="fieldset-metadate_change">

4
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
View File

@ -17,10 +17,10 @@ if (isset($this->obj)) {
<input id="obj_lastMod" type="hidden" value="<?php echo $this->obj->getLastModified('U'); ?>"></input> <input id="obj_lastMod" type="hidden" value="<?php echo $this->obj->getLastModified('U'); ?>"></input>
<input id='obj_type' type='hidden' value='block'></input> <input id='obj_type' type='hidden' value='block'></input>
<div class="playlist_title"> <div class="playlist_title">
<h3 id="bl_name"> <h3 id="obj_name">
<a id="playlist_name_display" contenteditable="true"><?php echo $this->obj->getName(); ?></a> <a id="playlist_name_display" contenteditable="true"><?php echo $this->obj->getName(); ?></a>
</h3> </h3>
<h4 id="bl_length"><?php echo $this->length; ?></h4> <h4 id="obj_length"><?php echo $this->length; ?></h4>
</div> </div>
<fieldset class="toggle closed" id="fieldset-metadate_change"> <fieldset class="toggle closed" id="fieldset-metadate_change">

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

@ -296,7 +296,7 @@ var AIRTIME = (function(AIRTIME){
$('#spl_name > a') $('#spl_name > a')
.empty() .empty()
.append(json.name); .append(json.name);
$('#spl_length') $('#obj_length')
.empty() .empty()
.append(json.length); .append(json.length);
$('#fieldset-metadate_change textarea') $('#fieldset-metadate_change textarea')