From 68041f4265c217edb3a6be9194cc893eaa8ee59b Mon Sep 17 00:00:00 2001
From: Saophalkun Ponlu <phalkunz@gmail.com>
Date: Wed, 26 Apr 2017 13:54:06 +1200
Subject: [PATCH 1/2] Wrap selection group input in label

---
 src/Forms/SelectionGroup.php                   | 10 +---------
 templates/SilverStripe/Forms/SelectionGroup.ss |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/Forms/SelectionGroup.php b/src/Forms/SelectionGroup.php
index 998e4f254..81a5c309f 100644
--- a/src/Forms/SelectionGroup.php
+++ b/src/Forms/SelectionGroup.php
@@ -101,17 +101,9 @@ class SelectionGroup extends CompositeField
                         'name' => $this->name,
                         'value' => $item->getValue(),
                         'checked' => $checked,
-                        'aria-labelledby' => "title-{$itemID}",
                     )
                 )),
-                "RadioLabel" => DBField::create_field('HTMLFragment', FormField::create_tag(
-                    'label',
-                    array(
-                        'id' => "title-{$itemID}",
-                        'for' => $itemID
-                    ),
-                    $item->getTitle()
-                )),
+                "RadioLabel" => $item->getTitle(),
                 "Selected" => $firstSelected,
             );
             $newItems[] = $item->customise($extra);
diff --git a/templates/SilverStripe/Forms/SelectionGroup.ss b/templates/SilverStripe/Forms/SelectionGroup.ss
index 8201cf936..8147c9a62 100644
--- a/templates/SilverStripe/Forms/SelectionGroup.ss
+++ b/templates/SilverStripe/Forms/SelectionGroup.ss
@@ -13,7 +13,7 @@
 	<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
 	<% loop $FieldSet %>
 		<li$Selected>
-			{$RadioButton}{$RadioLabel}
+			<label>{$RadioButton} {$RadioLabel}</label>
 			<% if $FieldList %>
 				$FieldHolder
 			<% end_if %>

From 1f74221c2d603bf4010d954e6746865b759979ce Mon Sep 17 00:00:00 2001
From: Christopher Joe <cjoe@silverstripe.com>
Date: Wed, 26 Apr 2017 16:03:52 +1200
Subject: [PATCH 2/2] Fix unit tests

---
 tests/php/Forms/SelectionGroupTest.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/php/Forms/SelectionGroupTest.php b/tests/php/Forms/SelectionGroupTest.php
index 58ccba206..d87fe9000 100644
--- a/tests/php/Forms/SelectionGroupTest.php
+++ b/tests/php/Forms/SelectionGroupTest.php
@@ -31,11 +31,11 @@ class SelectionGroupTest extends SapphireTest
         $listElOne = $listEls[0];
         $listElTwo = $listEls[1];
 
-        $this->assertEquals('one', (string)$listElOne->input[0]['value']);
-        $this->assertEquals('two', (string)$listElTwo->input[0]['value']);
+        $this->assertEquals('one', (string)$listElOne->label[0]->input[0]['value']);
+        $this->assertEquals('two', (string)$listElTwo->label[0]->input[0]['value']);
 
-        $this->assertEquals('one title', (string)$listElOne->label[0]);
-        $this->assertEquals('two title', (string)$listElTwo->label[0]);
+        $this->assertEquals(' one title', (string)$listElOne->label[0]);
+        $this->assertEquals(' two title', (string)$listElTwo->label[0]);
 
         $this->assertContains('one view', (string)$listElOne->div);
         $this->assertContains('two view', (string)$listElTwo->div);
@@ -53,11 +53,11 @@ class SelectionGroupTest extends SapphireTest
         $listElOne = $listEls[0];
         $listElTwo = $listEls[1];
 
-        $this->assertEquals('one', (string)$listElOne->input[0]['value']);
-        $this->assertEquals('two', (string)$listElTwo->input[0]['value']);
+        $this->assertEquals('one', (string)$listElOne->label[0]->input[0]['value']);
+        $this->assertEquals('two', (string)$listElTwo->label[0]->input[0]['value']);
 
-        $this->assertEquals('one', (string)$listElOne->label[0]);
-        $this->assertEquals('two', (string)$listElTwo->label[0]);
+        $this->assertEquals(' one', (string)$listElOne->label[0]);
+        $this->assertEquals(' two', (string)$listElTwo->label[0]);
     }
 
     function testLegacyItemsFieldHolderWithTitle()
@@ -72,10 +72,10 @@ class SelectionGroupTest extends SapphireTest
         $listElOne = $listEls[0];
         $listElTwo = $listEls[1];
 
-        $this->assertEquals('one', (string)$listElOne->input[0]['value']);
-        $this->assertEquals('two', (string)$listElTwo->input[0]['value']);
+        $this->assertEquals('one', (string)$listElOne->label[0]->input[0]['value']);
+        $this->assertEquals('two', (string)$listElTwo->label[0]->input[0]['value']);
 
-        $this->assertEquals('one title', (string)$listElOne->label[0]);
-        $this->assertEquals('two title', (string)$listElTwo->label[0]);
+        $this->assertEquals(' one title', (string)$listElOne->label[0]);
+        $this->assertEquals(' two title', (string)$listElTwo->label[0]);
     }
 }