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

moodle · Aug 25, 2023 · 33c8754 · 33c8754
2 parents 7b94cd0 + 24ce2bb
commit 33c8754
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/mod/glossary/lang/en/glossary.php b/mod/glossary/lang/en/glossary.php
@@ -280,6 +280,7 @@
 $string['page-mod-glossary-edit'] = 'Glossary add/edit entry page';
 $string['page-mod-glossary-view'] = 'View glossary edit page';
 $string['pendingapproval'] = 'Pending approval';
+$string['pendingapprovalcount'] = 'Pending approval ({$a})';
 $string['pluginadministration'] = 'Glossary administration';
 $string['pluginname'] = 'Glossary';
 $string['popupformat'] = 'Popup format';

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
@@ -3167,7 +3167,7 @@ function glossary_extend_settings_navigation(settings_navigation $settings, navi
     // Safe guard check - Ideally, there shouldn't be any hidden entries if the glossary has 'defaultapproval'.
     if (has_capability('mod/glossary:approve', $settings->get_page()->cm->context) &&
             (!$glossary->defaultapproval || $hiddenentries)) {
-        $glossarynode->add(get_string('pendingapproval', 'glossary'),
+        $glossarynode->add(get_string('pendingapprovalcount', 'glossary', $hiddenentries),
             new moodle_url('/mod/glossary/view.php', ['id' => $settings->get_page()->cm->id, 'mode' => 'approval']),
             navigation_node::TYPE_CUSTOM, null, 'pendingapproval');
     }

diff --git a/mod/glossary/tests/behat/entries_require_approval.feature b/mod/glossary/tests/behat/entries_require_approval.feature
@@ -40,7 +40,7 @@ Feature: A teacher can choose whether glossary entries require approval
     And I log out
     # Approve the entry.
     And I am on the "Test glossary name" "glossary activity" page logged in as teacher1
-    And I follow "Pending approval"
+    And I follow "Pending approval (1)"
     Then I should see "(this entry is currently hidden)"
     And I follow "Approve"
     And I am on the "Test glossary name" "glossary activity" page

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
@@ -295,7 +295,6 @@
 }
 if ($tab == GLOSSARY_APPROVAL_VIEW) {
     require_capability('mod/glossary:approve', $context);
-    $PAGE->navbar->add($strwaitingapproval);
 }
 
 $hassecondary = $PAGE->has_secondary_navigation();