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

CC-3548: Schedule: Separate repeate show template and single instance on 'When' section

Browse source 
-in progress
This commit is contained in:
Martin Konecny 2012-04-12 11:54:51 -04:00
parent 071874626e
commit 5a8df0321e
4 changed files with 91 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -543,7 +543,11 @@ class Application_Model_Preference
}
public static function GetAirtimeVersion(){
return self::GetValue("system_version");
if (defined('APPLICATION_ENV') && APPLICATION_ENV == "development"){
return self::GetValue("system_version")."+".exec("git rev-parse --short HEAD");
} else {
return self::GetValue("system_version");
}
}
public static function GetLatestVersion(){

3
airtime_mvc/application/models/Schedule.php
View file

@ -592,7 +592,8 @@ class Application_Model_Schedule {
$p_view->style = $formStyle;
$p_view->live = $formLive;
$formWhat->populate(array('add_show_id' => '-1'));
$formWhat->populate(array('add_show_id' => '-1',
'add_show_instance_id' => '-1'));
$formWhen->populate(array('add_show_start_date' => date("Y-m-d"),
'add_show_start_time' => '00:00',
'add_show_end_date_no_repeate' => date("Y-m-d"),