Select - fix selected for multiple (again), correct order in js

oXoi · Mar 22, 2015 · a8a4a7e · a8a4a7e
1 parent 6a51614
commit a8a4a7e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/usr/local/www/classes/Form/Select.class.php b/usr/local/www/classes/Form/Select.class.php
@@ -53,7 +53,11 @@ protected function _getInput()
 		$options = '';
 		foreach ($this->_values as $value => $name)
 		{
-			$selected = (is_array($this->_value) && array_key_exists($value, $this->_value) || $this->_value == $value);
+			if (isset($this->_attributes['multiple']))
+				$selected = in_array($value, (array)$this->_value);
+			else
+				$selected = ($this->_value == $value);
+
 			$options .= '<option value="'. htmlspecialchars($value) .'"'.($selected ? ' selected' : '').'>'. gettext($name) .'</option>';
 		}
 

diff --git a/usr/local/www/jquery/pfSense.js b/usr/local/www/jquery/pfSense.js
@@ -3,12 +3,6 @@
  */
 
 $(function() {
-	// Enable popovers globally
-	$('[data-toggle="popover"]').popover()
-
-	runEvents();
-	bindCollapseToOptions();
-
 	/**
 	 * Run in-page defined events
 	 */
@@ -43,4 +37,10 @@ $(function() {
 		// Trigger change to open currently selected item
 		selects.trigger('change');
 	};
+
+	// Enable popovers globally
+	$('[data-toggle="popover"]').popover()
+
+	runEvents();
+	bindCollapseToOptions();
 });