Merge branch 'MDL-77313' of https://github.com/paulholden/moodle

mgleeson · Apr 25, 2023 · 49d013e · 49d013e
2 parents b495ba0 + 1dbeca8
commit 49d013e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php
@@ -786,6 +786,10 @@ public function render_restore_course_search(restore_course_search $component) {
             'extraclasses' => 'rcs-search mb-3 w-25',
             'inputname' => restore_course_search::$VAR_SEARCH,
             'searchstring' => get_string('searchcourses'),
+            'buttonattributes' => [
+                (object) ['key' => 'name', 'value' => 'searchcourses'],
+                (object) ['key' => 'value', 'value' => 1],
+            ],
             'query' => $component->get_search(),
         ];
         $output .= $this->output->render_from_template('core/search_input', $data);
@@ -955,6 +959,10 @@ public function render_restore_category_search(restore_category_search $componen
             'extraclasses' => 'rcs-search mb-3 w-25',
             'inputname' => restore_category_search::$VAR_SEARCH,
             'searchstring' => get_string('searchcoursecategories'),
+            'buttonattributes' => [
+                (object) ['key' => 'name', 'value' => 'searchcourses'],
+                (object) ['key' => 'value', 'value' => 1],
+            ],
             'query' => $component->get_search(),
         ];
         $output .= $this->output->render_from_template('core/search_input', $data);

diff --git a/lib/templates/search_input.mustache b/lib/templates/search_input.mustache
@@ -28,6 +28,12 @@
         "searchstring": "Search settings",
         "value": "policy",
         "btnclass": "primary",
+        "buttonattributes": [
+            {
+                "key": "name",
+                "value": "hello"
+            }
+        ],
         "query": "themedesigner",
         "hiddenfields": [
             {
@@ -59,7 +65,10 @@
            value="{{ query }}"
         >
         <div class="input-group-append">
-            <button type="submit" class="btn {{^btnclass}}btn-submit{{/btnclass}} {{ btnclass }} search-icon">
+            <button type="submit"
+                class="btn {{^btnclass}}btn-submit{{/btnclass}} {{ btnclass }} search-icon"
+                {{#buttonattributes}}{{ key }}="{{ value }}" {{/buttonattributes}}
+            >
                 {{#pix}} a/search, core {{/pix}}
                 <span class="sr-only">{{ searchstring }}</span>
             </button>