Build form early and reactivate ajaxy replacing

This makes subform validation work for everything again. I also had to slightly unhack the corresponding js. It's still not very nice in that it still reloads even though ajax would have been enough but I could figure out why the mast source field was not getting the proper values (You can reproduce this by commenting the window.location.reload() in the js).

airtime_mvc/application/controllers/PreferenceController.php

@@ -200,6 +200,49 @@ class PreferenceController extends Zend_Controller_Action
         $csrf_element->setValue($csrf_namespace->authtoken)->setRequired('true')->removeDecorator('HtmlTag')->removeDecorator('Label');
         $form->addElement($csrf_element);
 
+        $live_stream_subform = new Application_Form_LiveStreamingPreferences();
+        $form->addSubForm($live_stream_subform, "live_stream_subform");
+
+        // get predefined type and bitrate from pref table
+        $temp_types = Application_Model_Preference::GetStreamType();
+        $stream_types = array();
+        foreach ($temp_types as $type) {
+            $type = strtolower(trim($type));
+            if (isset($name_map[$type])) {
+                $name = $name_map[$type];
+            } else {
+                $name = $type;
+            }
+            $stream_types[$type] = $name;
+        }
+
+        $temp_bitrate = Application_Model_Preference::GetStreamBitrate();
+        $max_bitrate = intval(Application_Model_Preference::GetMaxBitrate());
+        $stream_bitrates = array();
+        foreach ($temp_bitrate as $type) {
+            if (intval($type) <= $max_bitrate) {
+                $stream_bitrates[trim($type)] = strtoupper(trim($type))." kbit/s";
+            }
+        }
+
+        // get current settings
+        $setting = Application_Model_StreamSetting::getStreamSetting();
+        $form->setSetting($setting);
+
+        for ($i=1; $i<=$num_of_stream; $i++) {
+            $subform = new Application_Form_StreamSettingSubForm();
+            $subform->setPrefix($i);
+            $subform->setSetting($setting);
+            $subform->setStreamTypes($stream_types);
+            $subform->setStreamBitrates($stream_bitrates);
+            $subform->startForm();
+            $subform->toggleState();
+            $form->addSubForm($subform, "s".$i."_subform");
+        }
+
+        $live_stream_subform->updateVariables();
+        $form->startFrom();
+
         if ($request->isPost()) {
             $params = $request->getPost();
             /* Parse through post data and put in format
@@ -308,50 +351,6 @@ class PreferenceController extends Zend_Controller_Action
             }
         }
 
-        // get predefined type and bitrate from pref table
-        $temp_types = Application_Model_Preference::GetStreamType();
-        $stream_types = array();
-        foreach ($temp_types as $type) {
-            $type = strtolower(trim($type));
-            if (isset($name_map[$type])) {
-                $name = $name_map[$type];
-            } else {
-                $name = $type;
-            }
-            $stream_types[$type] = $name;
-        }
-
-        $temp_bitrate = Application_Model_Preference::GetStreamBitrate();
-        $max_bitrate = intval(Application_Model_Preference::GetMaxBitrate());
-        $stream_bitrates = array();
-        foreach ($temp_bitrate as $type) {
-            if (intval($type) <= $max_bitrate) {
-                $stream_bitrates[trim($type)] = strtoupper(trim($type))." kbit/s";
-            }
-        }
-
-        // get current settings
-        $setting = Application_Model_StreamSetting::getStreamSetting();
-
-        $form->setSetting($setting);
-        $form->startFrom();
-
-        $live_stream_subform = new Application_Form_LiveStreamingPreferences();
-        $form->addSubForm($live_stream_subform, "live_stream_subform");
-
-        for ($i=1; $i<=$num_of_stream; $i++) {
-            $subform = new Application_Form_StreamSettingSubForm();
-            $subform->setPrefix($i);
-            $subform->setSetting($setting);
-            $subform->setStreamTypes($stream_types);
-            $subform->setStreamBitrates($stream_bitrates);
-            $subform->startForm();
-            $subform->toggleState();
-            $form->addSubForm($subform, "s".$i."_subform");
-        }
-
-        $live_stream_subform->updateVariables();
-
         $this->view->num_stream = $num_of_stream;
         $this->view->enable_stream_conf = Application_Model_Preference::GetEnableStreamConf();
         $this->view->form = $form;

airtime_mvc/application/forms/LiveStreamingPreferences.php

@@ -144,12 +144,4 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
             )
         );
     }
-
-
-    public function isValid($data)
-    {
-        $isValid = parent::isValid($data);
-
-        return $isValid;
-    }
 }

airtime_mvc/public/js/airtime/preferences/streamsetting.js

@@ -478,11 +478,13 @@ $(document).ready(function() {
             var url = baseUrl+'Preference/stream-setting';
 
             $.post(url, {format:"json", data: data}, function(json){
-                window.location.reload();
+                $('#content').empty().append(json.html);
-                //$('#content').empty().append(json.html);
+                if (json.valid) {
-                //setupEventListeners();
+                    window.location.reload();
-                //setSliderForReplayGain();
+                } 
-                //setPseudoAdminPassword(json.s1_set_admin_pass, json.s2_set_admin_pass, json.s3_set_admin_pass, json.s4_set_admin_pass);
+                setupEventListeners();
+                setSliderForReplayGain();
+                getAdminPasswordStatus();
             });
         } else {
             if (e.prop('checked')) {