Merge pull request #68 from neoxia/5.1

[5.1] Checkboxes work with relationships
LaravelCollective · Sep 3, 2015 · 3ff2b89 · 3ff2b89
2 parents 59f1240 + de73798
commit 3ff2b89
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/src/FormBuilder.php b/src/FormBuilder.php
@@ -4,6 +4,7 @@
 use Illuminate\Routing\UrlGenerator;
 use Illuminate\Session\Store as Session;
 use Illuminate\Support\Traits\Macroable;
+use Illuminate\Support\Collection;
 
 class FormBuilder {
 
@@ -757,9 +758,20 @@ protected function getCheckboxCheckedState($name, $value, $checked)
 
     if($this->missingOldAndModel($name)) return $checked;
 
-    $posted = $this->getValueAttribute($name);
+    $posted = $this->getValueAttribute($name, $checked);
 
-    return is_array($posted) ? in_array($value, $posted) : (bool) $posted;
+    if (is_array($posted))
+    {
+      return in_array($value, $posted);
+    }
+    else if ($posted instanceof Collection)
+    {
+      return $posted->contains('id', $value);
+    }
+    else
+    {
+      return (bool) $posted;
+    }
   }
 
   /**

diff --git a/tests/FormBuilderTest.php b/tests/FormBuilderTest.php
@@ -7,6 +7,7 @@
 use Collective\Html\HtmlBuilder;
 use Illuminate\Routing\UrlGenerator;
 use Illuminate\Routing\RouteCollection;
+use Illuminate\Support\Collection;
 
 class FormBuilderTest extends PHPUnit_Framework_TestCase {
 
@@ -409,6 +410,30 @@ public function testFormCheckboxRepopulation()
   }
 
 
+  public function testFormCheckboxWithModelRelation()
+  {
+    $this->formBuilder->setSessionStore($session = m::mock('Illuminate\Session\Store'));
+    $session->shouldReceive('getOldInput')->withNoArgs()->andReturn(array());
+    $session->shouldReceive('getOldInput')->with('items')->andReturn(null);
+
+    $mockModel2 = new StdClass;
+    $mockModel2->id = 2;
+    $mockModel3 = new StdClass;
+    $mockModel3->id = 3;
+    $this->setModel(array('items' => new Collection(array($mockModel2, $mockModel3))));
+
+    $check1 = $this->formBuilder->checkbox('items[]', 1);
+    $check2 = $this->formBuilder->checkbox('items[]', 2);
+    $check3 = $this->formBuilder->checkbox('items[]', 3, false);
+    $check4 = $this->formBuilder->checkbox('items[]', 4, true);
+
+    $this->assertEquals('<input name="items[]" type="checkbox" value="1">', $check1);
+    $this->assertEquals('<input checked="checked" name="items[]" type="checkbox" value="2">', $check2);
+    $this->assertEquals('<input name="items[]" type="checkbox" value="3">', $check3);
+    $this->assertEquals('<input checked="checked" name="items[]" type="checkbox" value="4">', $check4);
+  }
+
+
   public function testFormCheckboxWithoutSession()
   {
     $form1 = $this->formBuilder->checkbox('foo');