Merge branch 'development', remote branch 'origin/development'

README.markdown

@@ -1,7 +1,7 @@
 Select Box Link Field Combo 
 ------------------------------------
 
-Version: 1.0beta<br />
+Version: 1.0beta2<br />
 Author: [Vlad Ghita](vlad_micutul@yahoo.com)<br />
 Build Date: 4th May 2011<br />
 Requirements:<br />
@@ -87,4 +87,8 @@ Enjoy!
 
 ##CHANGE LOG##
 
+1.0beta2<br />
+- Field rewrite. Better error checking on field settings.<br />
+- New and improved JS (good job Nils)
+
 1.0beta	- Initial release.

assets/selectbox_link_field_combo.publish.js

@@ -11,10 +11,10 @@
 				optgroup = select.find('optgroup'),
 				options = optgroup.find('option').remove(),
 				parent = $('#field-' + options.data('parent') + ' select');
-										
+
 			// Parent changes context
 			parent.change(function(event) {
-				var selected = parent.val(),
+				var selected = $.isArray(parent.val()) ? parent.val() : [parent.val()],
 					current = optgroup.find('option').remove();
 
 				// Remove current selection

extension.driver.php

@@ -5,8 +5,8 @@
 		public function about(){
 			return array(
 				'name' => 'Field: Select Box Link Combo',
-				'version' => '1.0beta',
-				'release-date' => '2011-05-04',
+				'version' => '1.0beta2',
+				'release-date' => '2011-05-23',
 				'author' => array(
 					'name' => 'Vlad Ghita',
 					'email' => 'vlad_micutul@yahoo.com'
@@ -17,7 +17,7 @@ public function about(){
 		public function getSubscribedDelegates(){
 			return array(
 				array(
-					'page' => '/administration/',
+					'page' => '/backend/',
 					'delegate' => 'AdminPagePreGenerate',
 					'callback' => 'appendAssets'
 				)
@@ -50,9 +50,9 @@ public function install(){
 					  `field_id` int(11) unsigned NOT NULL,
 					  `allow_multiple_selection` enum('yes','no') NOT NULL default 'no',
 					  `show_association` enum('yes','no') NOT NULL default 'yes',
-					  `related_field_id` VARCHAR(255) NOT NULL,
 					  `parent_field_id` int(11) unsigned NOT NULL,
-					  `relation_id` int(11) unsigned NOT NULL,
+					  `related_field_id` VARCHAR(255) NOT NULL,
+					  `relation_field_id` int(11) unsigned NOT NULL,
 					  `limit` int(4) unsigned NOT NULL default '20',
 				  PRIMARY KEY  (`id`),
 				  KEY `field_id` (`field_id`)