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

CC-4117: Smart Playlist: radio_station_name criteria doesnot take effect

Browse source 
- removing radio_station_name from criteria list
This commit is contained in:
James 2012-08-08 12:01:10 -04:00
parent aacf65cca6
commit fd1628f971
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/forms/SmartBlockCriteria.php
View file

@ -29,13 +29,12 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
"mood" => "Mood", "mood" => "Mood",
"name" => "Name", "name" => "Name",
"orchestra" => "Orchestra", "orchestra" => "Orchestra",
"radio_station_name" => "Radio Station Name",
"rating" => "Rating", "rating" => "Rating",
"sample_rate" => "Sample Rate", "sample_rate" => "Sample Rate",
"track_title" => "Title", "track_title" => "Title",
"track_number" => "Track Number", "track_number" => "Track Number",
"utime" => "Uploaded", "utime" => "Uploaded",
"year" => "Year" "year" => "Year"
); );
$criteriaTypes = array( $criteriaTypes = array(
@ -60,7 +59,6 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
"mood" => "s", "mood" => "s",
"name" => "s", "name" => "s",
"orchestra" => "s", "orchestra" => "s",
"radio_station_name" => "s",
"rating" => "n", "rating" => "n",
"sample_rate" => "n", "sample_rate" => "n",
"track_title" => "s", "track_title" => "s",
@ -210,7 +208,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
/* This is where the additional modifier rows get defined /* This is where the additional modifier rows get defined
* The additional row count starts at 0 and gets appended * The additional row count starts at 0 and gets appended
* to the parent field name * to the parent field name
*/ */
} else if (count($storedCrit["crit"][$criteriaKeys[$i]]) > 1) { } else if (count($storedCrit["crit"][$criteriaKeys[$i]]) > 1) {
$n = $j - 1; $n = $j - 1;
$criteria = new Zend_Form_Element_Select("sp_criteria_field_".$i."_".$n); $criteria = new Zend_Form_Element_Select("sp_criteria_field_".$i."_".$n);
@ -251,7 +249,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
$this->addElement($criteriaExtra); $this->addElement($criteriaExtra);
} }
}//for }//for
}//for }//for

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

@ -76,7 +76,6 @@ class Application_Model_Block
"mood" => "DbMood", "mood" => "DbMood",
"name" => "DbName", "name" => "DbName",
"orchestra" => "DbOrchestra", "orchestra" => "DbOrchestra",
"radio_station_name" => "DbRadioStationName",
"rating" => "DbRating", "rating" => "DbRating",
"sample_rate" => "DbSampleRate", "sample_rate" => "DbSampleRate",
"track_title" => "DbTrackTitle", "track_title" => "DbTrackTitle",
@ -1255,7 +1254,6 @@ EOT;
"mood" => "Mood", "mood" => "Mood",
"name" => "Name", "name" => "Name",
"orchestra" => "Orchestra", "orchestra" => "Orchestra",
"radio_station_name" => "Radio Station Name",
"rating" => "Rating", "rating" => "Rating",
"sample_rate" => "Sample Rate", "sample_rate" => "Sample Rate",
"track_title" => "Title", "track_title" => "Title",

1
airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
View file

@ -562,7 +562,6 @@ var criteriaTypes = {
"mood" : "s", "mood" : "s",
"name" : "s", "name" : "s",
"orchestra" : "s", "orchestra" : "s",
"radio_station_name" : "s",
"rating" : "n", "rating" : "n",
"sample_rate" : "n", "sample_rate" : "n",
"track_title" : "s", "track_title" : "s",