Merge pull request #816 from FrozenNode/dev

Merging 4.16.4 into master

changelog.md

@@ -1,5 +1,8 @@
 ## Changelog
 
+### 4.16.4
+- Bugfix: Strange old bug when using only a setter field on a model
+
 ### 4.16.3
 - Bugfix: Adding validateString back into Admin validator to avoid issues with old versions of Laravel
 

readme.md

@@ -4,7 +4,7 @@ Administrator is an administrative interface builder for [Laravel](http://larave
 
 - **Author:** Jan Hartigan
 - **Website:** [http://frozennode.com](http://administrator.frozennode.com/)
-- **Version:** 4.16.3
+- **Version:** 4.16.4
 
 [![Build Status](https://travis-ci.org/FrozenNode/Laravel-Administrator.png?branch=master)](https://travis-ci.org/FrozenNode/Laravel-Administrator)
 
@@ -53,6 +53,9 @@ Administrator is released under the MIT License. See the LICENSE file for detail
 
 ## Recent Changelog
 
+### 4.16.4
+- Bugfix: Strange old bug when using only a setter field on a model
+
 ### 4.16.3
 - Bugfix: Adding validateString back into Admin validator to avoid issues with old versions of Laravel
 

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

@@ -368,7 +368,7 @@ public function fillModel(&$model, \Illuminate\Http\Request $input, array $field
 				$field->fillModel($model, $input->get($name, NULL));
 			}
 			//if this is an "external" field (i.e. it's not a column on this model's table) or uneditable, unset it
-			else
+			else if ($name !== $model->getKeyName())
 			{
 				$model->__unset($name);
 			}

tests/Config/Model/ModelConfigTest.php

@@ -312,6 +312,7 @@ public function testFillModel()
 		$model->field_setter = 'field_setter_value';
 		$model->field_password = '';
 		$model->shouldReceive('__unset')->times(4);
+		$model->shouldReceive('getKeyName')->times(2);
 		$fields = array(
 			'field_external' => $field_external,
 			'field_uneditable' => $field_uneditable,