diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 4bc42ee41..b321372db 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -91,12 +91,7 @@ class PreferenceController extends Zend_Controller_Action $form = new Application_Form_SupportSettings(); if ($request->isPost()) { - $postData = $request->getPost(); - $values = array(); - //put postData in array format isValid() expects it to be in - foreach ($postData["data"] as $field) { - $values[$field["name"]] = $field["value"]; - } + $values = $request->getPost(); if ($values["Publicise"] != 1) { Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]); @@ -137,9 +132,6 @@ class PreferenceController extends Zend_Controller_Action $this->view->privacyChecked = $privacyChecked; $this->view->section_title = _('Support Feedback'); $this->view->form = $form; - if ($request->isPost()) { - die(json_encode(array("html"=>$this->view->render('preference/support-setting.phtml')))); - } } public function directoryConfigAction() diff --git a/airtime_mvc/application/views/scripts/preference/support-setting.phtml b/airtime_mvc/application/views/scripts/preference/support-setting.phtml index bbfd05fd9..5c22188c3 100644 --- a/airtime_mvc/application/views/scripts/preference/support-setting.phtml +++ b/airtime_mvc/application/views/scripts/preference/support-setting.phtml @@ -1,12 +1,13 @@

section_title?>

-
+ enctype="multipart/form-data" id="support-feedback-form">
statusMsg ?> form ?>
-
- +
+ form->getElement('submit')?> +
diff --git a/airtime_mvc/public/js/airtime/preferences/support-setting.js b/airtime_mvc/public/js/airtime/preferences/support-setting.js index 2fe35e4ce..0e72daf9f 100644 --- a/airtime_mvc/public/js/airtime/preferences/support-setting.js +++ b/airtime_mvc/public/js/airtime/preferences/support-setting.js @@ -11,23 +11,8 @@ function showErrorSections() { } $(document).ready(function() { - setUpEventListeners(); -}); - -function setUpEventListeners() { var form = $("form"); - $("#support_save").click( function() { - var data = $("#support-feedback-form").serializeArray(); - var url = baseUrl+'/Preference/support-setting'; - - $.post(url, {format:"json", data: data}, function(data){ - var json = $.parseJSON(data); - $("#support-feedback-view").parent().empty().append(json.html); - setUpEventListeners(); - }); - }); - $("#SupportFeedback").click( function(){ var pub = $("#Publicise"); if( !$(this).is(':checked') ){ @@ -96,4 +81,4 @@ function setUpEventListeners() { logoEl.find(".errors").remove(); } }); -} +});