Merge pull request #800 from opf/fix/accessibility-timeline-grouping-labels-2146

app/views/timelines/group/_grouping.html.erb

@@ -35,7 +35,7 @@ See doc/COPYRIGHT.rdoc for more details.
   <div style="display:none;">
     <div>
       <p class="tl-form-overflow">
-        <%= label_tag :timeline_options_grouping_one,
+        <%= label_tag :timeline_options_grouping_one_enabled,
                       l('timelines.filter.grouping_one') %>
 
         <%= check_box_tag("timeline[options][grouping_one_enabled]",
@@ -87,7 +87,7 @@ See doc/COPYRIGHT.rdoc for more details.
       </p>
 
       <p class="tl-form-overflow">
-        <%= label_tag :timeline_options_grouping_two,
+        <%= label_tag :timeline_options_grouping_two_enabled,
                       l('timelines.filter.grouping_two') %>
 
         <%= check_box_tag("timeline[options][grouping_two_enabled]",

doc/CHANGELOG.md

@@ -30,6 +30,7 @@ See doc/COPYRIGHT.rdoc for more details.
 # Changelog
 
 * `#1951` Layout for ## and ### textile link help is broken
+* `#2146` [Accessibility] Link form elements to their label - timeline groupings
 * `#2147` [Accessibility] Link form elements to their label - new timeline
 * `#2150` [Accessibility] Link form elements to their label - new issue query
 * `#2151` [Accessibility] Link form elements to their label - new wiki page