From 8e4a7c6b9084f9679fa5466473fcc85665b5d2fa Mon Sep 17 00:00:00 2001 From: Mihail Geshoski Date: Thu, 23 Sep 2021 10:57:20 +0800 Subject: [PATCH] MDL-72642 navigation: Fix duplicated ID in more menu items --- lib/classes/navigation/output/more_menu.php | 1 + lib/templates/moremenu.mustache | 11 ++++++----- lib/templates/moremenu_children.mustache | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/classes/navigation/output/more_menu.php b/lib/classes/navigation/output/more_menu.php index 7947c88766e..4c8fb915481 100644 --- a/lib/classes/navigation/output/more_menu.php +++ b/lib/classes/navigation/output/more_menu.php @@ -64,6 +64,7 @@ class more_menu implements renderable, templatable { } else { $data['nodearray'] = (array) $this->content; } + $data['moremenuid'] = uniqid(); return $data; } diff --git a/lib/templates/moremenu.mustache b/lib/templates/moremenu.mustache index 52662983ba9..49363022d37 100644 --- a/lib/templates/moremenu.mustache +++ b/lib/templates/moremenu.mustache @@ -41,11 +41,12 @@ "action": "/admin/search.php" } ] - } + }, + "moremenuid": "614c104dbacfa" } }} {{#js}} require(['core/moremenu'], function(moremenu) { - moremenu(document.querySelector('#moremenu-{{ uniqid }}-{{navbarstyle}}')); + moremenu(document.querySelector('#moremenu-{{moremenuid}}-{{navbarstyle}}')); }); {{/js}} diff --git a/lib/templates/moremenu_children.mustache b/lib/templates/moremenu_children.mustache index e404bf975bf..07ab617917f 100644 --- a/lib/templates/moremenu_children.mustache +++ b/lib/templates/moremenu_children.mustache @@ -23,7 +23,7 @@ { "divider": "", "haschildren": "", - "uniqid": "Unique string", + "moremenuid": "614c104dbacfa", "text": "Moodle community", "children": "", "title": "Moodle community", @@ -32,10 +32,10 @@ }} {{#haschildren}}