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

SAAS-67: "Hardware Audio Out" shows when SaaS is enabled 

- "Hardware Audio Out" is not visible when plan-level is not diabled
This commit is contained in:
james 2011-11-13 13:58:47 -05:00
parent 20fc49b7be
commit 68f142470a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/controllers/PreferenceController.php
View File

@ -160,8 +160,10 @@ class PreferenceController extends Zend_Controller_Action
$num_of_stream = intval(Application_Model_Preference::GetNumOfStreams()); $num_of_stream = intval(Application_Model_Preference::GetNumOfStreams());
$form = new Application_Form_StreamSetting(); $form = new Application_Form_StreamSetting();
$form->setSetting($setting); if(Application_Model_Preference::GetPlanLevel() == 'disabled'){
$form->startFrom(); $form->setSetting($setting);
$form->startFrom();
}
for($i=1; $i<=$num_of_stream; $i++){ for($i=1; $i<=$num_of_stream; $i++){
$subform = new Application_Form_StreamSettingSubForm(); $subform = new Application_Form_StreamSettingSubForm();
$subform->setPrefix($i); $subform->setPrefix($i);

2
airtime_mvc/application/views/scripts/preference/stream-setting.phtml
View File

@ -8,6 +8,7 @@
<div style="clear:both"></div> <div style="clear:both"></div>
<?php }?> <?php }?>
<?php echo $this->statusMsg;?> <?php echo $this->statusMsg;?>
<?php if($this->form->getElement('output_sound_device') != null){?>
<fieldset class="padded"> <fieldset class="padded">
<legend>Hardware Audio Out</legend> <legend>Hardware Audio Out</legend>
<dl class="zend_form"> <dl class="zend_form">
@ -21,6 +22,7 @@
</dd> </dd>
</dl> </dl>
</fieldset> </fieldset>
<?php } ?>
<?php <?php
for($i=1;$i<=$this->num_stream;$i++){ for($i=1;$i<=$this->num_stream;$i++){
echo $this->form->getSubform("s".$i."_subform"); echo $this->form->getSubform("s".$i."_subform");