From 8710c009705c5d4d7735e44a6183ef7c5053b1df Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 18 May 2012 12:58:09 -0400 Subject: [PATCH] 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 --- .../application/forms/GeneralPreferences.php | 9 ++- .../scripts/form/preferences_general.phtml | 64 ++++++++++--------- 2 files changed, 40 insertions(+), 33 deletions(-) diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php index fd61cf957..60dcccee1 100644 --- a/airtime_mvc/application/forms/GeneralPreferences.php +++ b/airtime_mvc/application/forms/GeneralPreferences.php @@ -2,11 +2,16 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm { - + private $isSaas; + public function init() { + $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; + $this->isSaas = $isSaas; + Logging::log($this->isSaas==true?"true":"false"); + $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(); diff --git a/airtime_mvc/application/views/scripts/form/preferences_general.phtml b/airtime_mvc/application/views/scripts/form/preferences_general.phtml index b62531480..956b3879e 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_general.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_general.phtml @@ -72,7 +72,7 @@
- element->getElement('weekStartDay')->getValue(); ?>