Merge pull request #946 from FrozenNode/dev

Dev into master

changelog.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 5.0.7
+- Bugfix: Fixed boolean true bug 
+- Bugfix: Fixes a bug where soft deletes are not being properly detected in L5
+
 ### 5.0.6
 - Added: Support for custom domains in the admin routes
 - Added: Ability to access the model from withinthe column output renderer

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:** 5.0.6
+- **Version:** 5.0.7
 
 [![Build Status](https://travis-ci.org/FrozenNode/Laravel-Administrator.png?branch=master)](https://travis-ci.org/FrozenNode/Laravel-Administrator)
 
@@ -63,6 +63,10 @@ Administrator is released under the MIT License. See the LICENSE file for detail
 
 ## Recent Changelog
 
+### 5.0.7
+- Bugfix: Fixed boolean true bug 
+- Bugfix: Fixes a bug where soft deletes are not being properly detected in L5
+
 ### 5.0.6
 - Added: Support for custom domains in the admin routes
 - Added: Ability to access the model from withinthe column output renderer

src/Frozennode/Administrator/DataTable/Columns/Relationships/Relationship.php

@@ -96,7 +96,7 @@ public function getRelationshipWheres($relationship, $tableAlias, $pivotAlias =
 		//one element of the relationship query's wheres is always useless (it will say pivot_table.other_id is null)
 		//depending on whether or not softdeletes are enabled on the other model, this will be in either position 0
 		//or 1 of the wheres array
-		array_splice($query->wheres, (isset($relationshipModel->runSoftDelete) ? 1 : 0), 1);
+		array_splice($query->wheres, (method_exists($relationshipModel, 'getDeletedAtColumn') ? 1 : 0), 1);
 
 		//iterate over the wheres to properly alias the columns
 		foreach ($query->wheres as &$where)

src/Frozennode/Administrator/Fields/Bool.php

@@ -38,7 +38,7 @@ public function build()
 	 */
 	public function fillModel(&$model, $input)
 	{
-		$model->{$this->getOption('field_name')} = $input === 'true' || $input === '1' ? 1 : 0;
+		$model->{$this->getOption('field_name')} = $input === 'true' || $input === '1' || $input === true ? 1 : 0;
 	}
 
 	/**

tests/DataTable/Columns/Relationships/RelationshipTest.php

@@ -79,7 +79,7 @@ public function testGetRelationshipWheres()
 		$eloquentQuery = m::mock('Illuminate\Database\Eloquent\Builder');
 		$eloquentQuery->shouldReceive('getQuery')->once()->andReturn($query);
 		$relatedModel = m::mock('Illuminate\Database\Eloquent\Model');
-		$relatedModel->shouldReceive('hasGetMutator')->once();
+		$relatedModel->shouldReceive('hasGetMutator')->never();
 		$relationship = m::mock('Illuminate\Database\Eloquent\Relations\Relation');
 		$relationship->shouldReceive('getQuery')->once()->andReturn($eloquentQuery)
 						->shouldReceive('getRelated')->once()->andReturn($relatedModel);