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

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

Browse source
This commit is contained in:
Martin Konecny 2012-04-27 18:36:14 -04:00
commit 20af2c287f
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/forms/AddShowWhen.php
View file

@ -69,7 +69,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
$this->addElement('text', 'add_show_duration', array(
'label' => 'Duration:',
'class' => 'input_text',
'value' => '01h00m',
'value' => '01h 00m',
'readonly' => true,
'decorators' => array('ViewHelper')
));
@ -99,8 +99,8 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
}
}
if( $formData["add_show_duration"] == "0m" ) {
$this->getElement('add_show_duration')->setErrors(array('Cannot have duration 0m'));
if( $formData["add_show_duration"] == "00h 00m" ) {
$this->getElement('add_show_duration')->setErrors(array('Cannot have duration 00h 00m'));
$valid = false;
}elseif(strpos($formData["add_show_duration"], 'h') !== false && intval(substr($formData["add_show_duration"], 0, strpos($formData["add_show_duration"], 'h'))) > 24) {
$this->getElement('add_show_duration')->setErrors(array('Cannot have duration greater than 24h'));

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

@ -618,7 +618,7 @@ class Application_Model_Schedule {
'add_show_start_time' => '00:00',
'add_show_end_date_no_repeate' => date("Y-m-d"),
'add_show_end_time' => '01:00',
'add_show_duration' => '1h'));
'add_show_duration' => '01h 00m'));
$formRepeats->populate(array('add_show_end_date' => date("Y-m-d")));

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

@ -765,7 +765,7 @@ class Application_Model_Show {
return $showDay->getDbDuration();
}else{
$info = explode(':',$showDay->getDbDuration());
return ($info[0] != 0 ? intval($info[0]).'h'.' ' : '').($info[1] != 0 ? intval($info[1]).'m' : '');
return str_pad(intval($info[0]),2,'0',STR_PAD_LEFT).'h '.str_pad(intval($info[1]),2,'0',STR_PAD_LEFT).'m';
}
}

8
install_minimal/upgrades/airtime-2.1.0/common/Version20120403143635.php
View file

@ -10,10 +10,10 @@ class Version20120403143635 extends AbstractMigration
public function up(Schema $schema)
{
$cc_show = $schema->getTable('cc_show');
$cc_show->addColumn('live_stream_using_airtime_auth', 'boolean', array('default'=> 'false'));
$cc_show->addColumn('live_stream_using_custom_auth', 'boolean', array('default'=> 'false'));
$cc_show->addColumn('live_stream_user', 'string', array('notnull' => 0, 'length' => 255));
$cc_show->addColumn('live_stream_pass', 'string', array('notnull' => 0, 'length' => 255));
$cc_show->addColumn('live_stream_using_airtime_auth', 'boolean', array('default'=> 0, 'notnull' => 0));
$cc_show->addColumn('live_stream_using_custom_auth', 'boolean', array('default'=> 0, 'notnull' => 0));
$cc_show->addColumn('live_stream_user', 'string', array('default'=> 0, 'notnull' => 0, 'length' => 255));
$cc_show->addColumn('live_stream_pass', 'string', array('default'=> 0, 'notnull' => 0, 'length' => 255));
}
public function down(Schema $schema)