Fixed bugs in filtering and editing fields in relationship

src/Frozennode/Administrator/Config/Model/Config.php

@@ -186,7 +186,9 @@ public function setModelRelationship(&$model, Field $field)
 			//iterate over the items
 			foreach ($relatedItems as $item)
 			{
-				$keyName = $item->getKeyName();
+				// Modified. If this is set to 'keyName', it will not get foriegn key correctly
+				$keyName = $field->getOption('column');
+				// $keyName = $item->getKeyName();
 
 				//if this is a mutliple-value type (i.e. HasMany, BelongsToMany), make sure this is an array
 				if ($multipleValues)
@@ -544,7 +546,7 @@ public function runQueryFilter(\Illuminate\Database\Query\Builder &$query)
 			$filter($query);
 		}
 	}
-	
+
 	/**
 	 * Fetches the data model for a config given a post input array
 	 *

src/Frozennode/Administrator/Fields/Relationships/BelongsTo.php

@@ -28,7 +28,9 @@ public function build()
 		$relatedModel = $relationship->getRelated();
 
 		$options['table'] = $relatedModel->getTable();
-		$options['column'] = $relatedModel->getKeyName();
+
+		// Assign foreign key value to column, instead of primary key
+		$options['column'] = $relatedModel->getOtherKey();
 		$options['foreign_key'] = $relationship->getForeignKey();
 
 		$this->suppliedOptions = $options;
@@ -71,4 +73,4 @@ public function filterQuery(QueryBuilder &$query, &$selects = null)
 		$query->where($this->getOption('foreign_key'), '=', $this->getOption('value'));
 	}
 
-}
+}

src/Frozennode/Administrator/Fields/Relationships/Relationship.php

@@ -158,13 +158,15 @@ public function loadRelationshipOptions(&$options)
 			// if no related items exist, add default item, if set in options
 			if (count($items) == 0 && array_key_exists('value', $options))
 			{
-				$items = $relatedModel->where($relatedModel->getKeyName(), '=', $options['value'])->get();
+				$items = $relatedModel->where($relationship->getOtherKey(), '=', $options['value'])->get();
 			}
 		}
 
 		//map the options to the options property where array('id': [key], 'text': [nameField])
 		$nameField = $this->validator->arrayGet($options, 'name_field', $this->defaults['name_field']);
-		$keyField = $relatedModel->getKeyName();
+
+		//fixed bug in model config when filtering by foreign key (belongsTo)
+		$keyField = $relationship->getOtherKey();
 		$options['options'] = $this->mapRelationshipOptions($items, $nameField, $keyField);
 	}
 
@@ -203,4 +205,4 @@ public function getDefaults()
 
 		return array_merge($defaults, $this->relationshipDefaults);
 	}
-}
+}