MDL-65217 form: id for error area

valmynd · Apr 29, 2019 · 521989e · 521989e
1 parent 086aa54
commit 521989e
Show file tree

Hide file tree

Showing 28 changed files with 34 additions and 34 deletions.
diff --git a/lib/form/templatable_form_element.php b/lib/form/templatable_form_element.php
@@ -82,6 +82,7 @@ public function export_for_template(renderer_base $output) {
         $context['type'] = $this->getType();
         $context['attributes'] = implode(' ', $otherattributes);
         $context['emptylabel'] = ($this->getLabel() === '');
+        $context['iderror'] = preg_replace('/^id_/', 'id_error_', $context['id']);
 
         // Elements with multiple values need array syntax.
         if ($this->getAttribute('multiple')) {

diff --git a/lib/form/templates/element-advcheckbox-inline.mustache b/lib/form/templates/element-advcheckbox-inline.mustache
@@ -15,7 +15,7 @@
     {{#element.checked}}checked{{/element.checked}}
     size="{{element.size}}"
     {{#error}}
-        autofocus aria-describedby="id_error_{{element.name}}"
+        autofocus aria-describedby="{{element.iderror}}"
     {{/error}}
     {{#element.frozen}}
         disabled
@@ -27,7 +27,7 @@
     <em>{{{.}}}</em>
 {{/text}}
 {{{helpbutton}}}
-<span class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
+<span class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
     {{{error}}}
 </span>
 {{^element.frozen}}

diff --git a/lib/form/templates/element-advcheckbox.mustache b/lib/form/templates/element-advcheckbox.mustache
@@ -25,7 +25,7 @@
                 {{/element.selectedvalue}}
                 id="{{element.id}}" {{#element.checked}}checked{{/element.checked}}
                 {{#error}}
-                    autofocus aria-describedby="id_error_{{element.name}}"
+                    autofocus aria-describedby="{{element.iderror}}"
                 {{/error}}
                 {{#element.frozen}}
                     disabled
@@ -43,7 +43,7 @@
                 {{{helpbutton}}}
             </span>
         </div>
-        <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
+        <div class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
             {{{error}}}
         </div>
     </div>

diff --git a/lib/form/templates/element-autocomplete-inline.mustache b/lib/form/templates/element-autocomplete-inline.mustache
@@ -8,7 +8,7 @@
             id="{{element.id}}"
             {{#element.multiple}}multiple{{/element.multiple}}
             {{#error}}
-                autofocus aria-describedby="id_error_{{element.name}}"
+                autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
             {{{element.attributes}}} >
             {{#element.options}}

diff --git a/lib/form/templates/element-autocomplete.mustache b/lib/form/templates/element-autocomplete.mustache
@@ -8,7 +8,7 @@
             id="{{element.id}}"
             {{#element.multiple}}multiple{{/element.multiple}}
             {{#error}}
-                autofocus aria-describedby="id_error_{{element.name}}"
+                autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
             {{{element.attributes}}} >
             {{#element.options}}

diff --git a/lib/form/templates/element-button-inline.mustache b/lib/form/templates/element-button-inline.mustache
@@ -7,7 +7,7 @@
                 id="{{element.id}}"
                 type="button"
                 {{#error}}
-                    autofocus aria-describedby="id_error_{{element.name}}"
+                    autofocus aria-describedby="{{element.iderror}}"
                 {{/error}}
                 {{{element.attributes}}}
                 >

diff --git a/lib/form/templates/element-button.mustache b/lib/form/templates/element-button.mustache
@@ -7,7 +7,7 @@
                 id="{{element.id}}"
                 type="button"
                 {{#error}}
-                    autofocus aria-describedby="id_error_{{element.name}}"
+                    autofocus aria-describedby="{{element.iderror}}"
                 {{/error}}
                 {{{element.attributes}}}>
                 {{{element.value}}}

diff --git a/lib/form/templates/element-checkbox-inline.mustache b/lib/form/templates/element-checkbox-inline.mustache
@@ -15,7 +15,7 @@
     {{#element.checked}}checked{{/element.checked}}
     size="{{element.size}}"
     {{#error}}
-        autofocus aria-describedby="id_error_{{element.name}}"
+        autofocus aria-describedby="{{element.iderror}}"
     {{/error}}
     {{#element.frozen}}
         disabled
@@ -27,7 +27,7 @@
     <em>{{{.}}}</em>
 {{/text}}
 {{{helpbutton}}}
-<span class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
+<span class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
     {{{error}}}
 </span>
 {{^element.frozen}}

diff --git a/lib/form/templates/element-checkbox.mustache b/lib/form/templates/element-checkbox.mustache
@@ -25,7 +25,7 @@
                 {{/element.value}}
                 id="{{element.id}}" {{#element.checked}}checked{{/element.checked}}
                 {{#error}}
-                    autofocus aria-describedby="id_error_{{element.name}}"
+                    autofocus aria-describedby="{{element.iderror}}"
                 {{/error}}
                 {{#element.frozen}}
                     disabled
@@ -43,7 +43,7 @@
                 {{{helpbutton}}}
             </span>
         </div>
-        <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
+        <div class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
             {{{error}}}
         </div>
     </div>

diff --git a/lib/form/templates/element-password.mustache b/lib/form/templates/element-password.mustache
@@ -8,7 +8,7 @@
                 value="{{element.value}}"
                 size="{{element.size}}"
                 {{#error}}
-                    autofocus aria-describedby="id_error_{{element.name}}"
+                    autofocus aria-describedby="{{element.iderror}}"
                 {{/error}} {{{element.attributes}}}>
         {{/element.frozen}}
     {{/element}}

diff --git a/lib/form/templates/element-passwordunmask.mustache b/lib/form/templates/element-passwordunmask.mustache
@@ -57,7 +57,7 @@
                         class="form-control d-inline-block {{# error }}is-invalid{{/ error }}"
                         data-size="{{ element.size }}"
                         {{# error }}
-                            autofocus aria-describedby="id_error_{{ element.name }}"
+                            autofocus aria-describedby="{{ element.iderror }}"
                         {{/ error }}
                         {{{ attributes }}}
                         >

diff --git a/lib/form/templates/element-radio-inline.mustache b/lib/form/templates/element-radio-inline.mustache
@@ -19,7 +19,7 @@
     {{#element.checked}}checked{{/element.checked}}
     {{#element.frozen}}disabled{{/element.frozen}}
     {{#error}}
-        autofocus aria-describedby="id_error_{{element.name}}"
+        autofocus aria-describedby="{{element.iderror}}"
     {{/error}}
     {{{element.attributes}}} >
     {{{label}}}
@@ -28,7 +28,7 @@
     <em>{{{.}}}</em>
 {{/text}}
 {{{helpbutton}}}
-<span class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
+<span class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
     {{{error}}}
 </span>
 {{^element.frozen}}

diff --git a/lib/form/templates/element-radio.mustache b/lib/form/templates/element-radio.mustache
@@ -30,7 +30,7 @@
                     {{#element.checked}}checked{{/element.checked}}
                     {{#element.frozen}}disabled{{/element.frozen}}
                     {{#error}}
-                        autofocus aria-describedby="id_error_{{element.name}}"
+                        autofocus aria-describedby="{{element.iderror}}"
                     {{/error}} {{{element.attributes}}} >
                 {{#text}}
                     {{{.}}}
@@ -44,7 +44,7 @@
             {{{helpbutton}}}
             </span>
         </div>
-        <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
+        <div class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
             {{{error}}}
         </div>
     </div>

diff --git a/lib/form/templates/element-select-inline.mustache b/lib/form/templates/element-select-inline.mustache
@@ -11,7 +11,7 @@
         id="{{element.id}}"
         {{#element.multiple}}multiple size="{{element.size}}"{{/element.multiple}}
         {{#error}}
-            autofocus aria-describedby="id_error_{{element.name}}"
+            autofocus aria-describedby="{{element.iderror}}"
         {{/error}}
         {{{element.attributes}}} >
         {{#element.options}}

diff --git a/lib/form/templates/element-select.mustache b/lib/form/templates/element-select.mustache
@@ -104,7 +104,7 @@
             id="{{element.id}}"
             {{#element.multiple}}multiple size="{{element.size}}"{{/element.multiple}}
             {{#error}}
-                autofocus aria-describedby="id_error_{{element.name}}"
+                autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
             {{{element.attributes}}} >
             {{#element.options}}

diff --git a/lib/form/templates/element-selectgroups-inline.mustache b/lib/form/templates/element-selectgroups-inline.mustache
@@ -5,7 +5,7 @@
         id="{{element.id}}"
         {{#element.multiple}}multiple{{/element.multiple}}
         {{#error}}
-            autofocus aria-describedby="id_error_{{element.name}}"
+            autofocus aria-describedby="{{element.iderror}}"
         {{/error}}
         {{{element.attributes}}} >
         {{#element.optiongroups}}

diff --git a/lib/form/templates/element-selectgroups.mustache b/lib/form/templates/element-selectgroups.mustache
@@ -5,7 +5,7 @@
             id="{{element.id}}"
             {{#element.multiple}}multiple{{/element.multiple}}
             {{#error}}
-                autofocus aria-describedby="id_error_{{element.name}}"
+                autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
             {{{element.attributes}}} >
             {{#element.optiongroups}}

diff --git a/lib/form/templates/element-selectwithlink.mustache b/lib/form/templates/element-selectwithlink.mustache
@@ -5,7 +5,7 @@
             id="{{element.id}}"
             {{#element.multiple}}multiple{{/element.multiple}}
             {{#error}}
-                autofocus aria-describedby="id_error_{{element.name}}"
+                autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
             {{{element.attributes}}} >
             {{#element.options}}

diff --git a/lib/form/templates/element-submit.mustache b/lib/form/templates/element-submit.mustache
@@ -13,7 +13,7 @@
                 name="{{element.name}}"
                 id="{{element.id}}"
                 {{#error}}
-                    autofocus aria-describedby="id_error_{{element.name}}"
+                    autofocus aria-describedby="{{element.iderror}}"
                 {{/error}}
                 value="{{element.value}}"
                 {{{element.attributes}}} >

diff --git a/lib/form/templates/element-tags-inline.mustache b/lib/form/templates/element-tags-inline.mustache
@@ -6,7 +6,7 @@
             id="{{element.id}}"
             {{#element.multiple}}multiple{{/element.multiple}}
             {{#error}}
-                autofocus aria-describedby="id_error_{{element.name}}"
+                autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
             {{{element.attributes}}} >
             {{#element.options}}

diff --git a/lib/form/templates/element-tags.mustache b/lib/form/templates/element-tags.mustache
@@ -6,7 +6,7 @@
             id="{{element.id}}"
             {{#element.multiple}}multiple{{/element.multiple}}
             {{#error}}
-                autofocus aria-describedby="id_error_{{element.name}}"
+                autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
             {{{element.attributes}}} >
             {{#element.options}}

diff --git a/lib/form/templates/element-template-inline.mustache b/lib/form/templates/element-template-inline.mustache
@@ -9,7 +9,7 @@
             <!-- Element goes here -->
         {{/ element }}
     </span>
-    <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
+    <div class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
         {{{error}}}
     </div>
 </div>

diff --git a/lib/form/templates/element-template.mustache b/lib/form/templates/element-template.mustache
@@ -64,7 +64,7 @@
         {{$ element }}
             <!-- Element goes here -->
         {{/ element }}
-        <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
+        <div class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
             {{{error}}}
         </div>
     </div>

diff --git a/lib/form/templates/element-text-inline.mustache b/lib/form/templates/element-text-inline.mustache
@@ -10,7 +10,7 @@
             value="{{element.value}}"
             size="{{element.size}}"
             {{#error}}
-                autofocus aria-describedby="id_error_{{element.name}}"
+                autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
             {{{element.attributes}}}>
     {{/element}}

diff --git a/lib/form/templates/element-text.mustache b/lib/form/templates/element-text.mustache
@@ -10,7 +10,7 @@
                 value="{{element.value}}"
                 size="{{element.size}}"
                 {{#error}}
-                    autofocus aria-describedby="id_error_{{element.name}}"
+                    autofocus aria-describedby="{{element.iderror}}"
                 {{/error}}
                 {{{element.attributes}}} >
     {{/element}}

diff --git a/lib/form/templates/element-textarea.mustache b/lib/form/templates/element-textarea.mustache
@@ -6,7 +6,7 @@
             id="{{element.id}}"
             class="form-control {{#error}}is-invalid{{/error}}"
             {{#error}}
-                autofocus aria-describedby="id_error_{{element.name}}"
+                autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
             {{{element.attributes}}} >{{element.value}}</textarea>
         {{/element.frozen}}

diff --git a/lib/form/templates/element-url.mustache b/lib/form/templates/element-url.mustache
@@ -10,7 +10,7 @@
                 value="{{element.value}}"
                 size="{{element.size}}"
                 {{#error}}
-                    autofocus aria-describedby="id_error_{{element.name}}"
+                    autofocus aria-describedby="{{element.iderror}}"
                 {{/error}}
                 {{#element.frozen}}
                     readonly {{#element.hardfrozen}}disabled{{/element.hardfrozen}}

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
@@ -4593,8 +4593,7 @@ public function mform_element($element, $required, $advanced, $error, $ingroup)
                     // The id will be something like 'fgroup_id_NAME'. E.g. fgroup_id_mygroup.
                     $elementcontext['wrapperid'] = $elementcontext['id'];
 
-                    // Ensure group elements pass through the group name as the element name so the id_error_{{element.name}} is
-                    // properly set in the template.
+                    // Ensure group elements pass through the group name as the element name.
                     $elementcontext['name'] = $elementcontext['groupname'];
                 } else {
                     // Non grouped element.