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

SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command 

-these options are hidden is instance is saas
This commit is contained in:
denise 2012-05-18 12:58:09 -04:00
parent 766f897dfe
commit 8710c00970
2 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
airtime_mvc/application/forms/GeneralPreferences.php
View File

@ -2,11 +2,16 @@
class Application_Form_GeneralPreferences extends Zend_Form_SubForm class Application_Form_GeneralPreferences extends Zend_Form_SubForm
{ {
private $isSaas;
public function init() public function init()
{ {
$isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
$this->isSaas = $isSaas;
Logging::log($this->isSaas==true?"true":"false");
$this->setDecorators(array( $this->setDecorators(array(
array('ViewScript', array('viewScript' => 'form/preferences_general.phtml')) array('ViewScript', array('viewScript' => 'form/preferences_general.phtml', "isSaas" => $isSaas))
)); ));
$defaultFade = Application_Model_Preference::GetDefaultFade(); $defaultFade = Application_Model_Preference::GetDefaultFade();

2
airtime_mvc/application/views/scripts/form/preferences_general.phtml
View File

@ -94,6 +94,7 @@
</dd> </dd>
<!-- Enable System Email option --> <!-- Enable System Email option -->
<?php if( !$this->isSaas ){?>
<dt id="enableSystemEmail-label" class="block-display"> <dt id="enableSystemEmail-label" class="block-display">
<label class="required" for="timezone"><?php echo $this->element->getElement('enableSystemEmail')->getLabel() ?>: <label class="required" for="timezone"><?php echo $this->element->getElement('enableSystemEmail')->getLabel() ?>:
</label> </label>
@ -124,5 +125,6 @@
</ul> </ul>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<?php } ?>
</dl> </dl>
</fieldset> </fieldset>