From d7ba3f656d50f783315fcd7d16d97775bf51db3d Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Tue, 9 May 2023 12:02:31 +0100
Subject: [PATCH] MDL-78149 mod_data: ensure group selector is always present.

---
 mod/data/view.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod/data/view.php b/mod/data/view.php
index 539ba45748a..8f8edabdaa9 100644
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -382,6 +382,12 @@ if ($showactivity) {
             $requiredentries_allowed = false;
         }
 
+        if ($groupmode != NOGROUPS) {
+            $returnurl = new moodle_url('/mod/data/view.php', ['d' => $data->id, 'mode' => $mode, 'search' => s($search),
+                'sort' => s($sort), 'order' => s($order)]);
+            echo html_writer::div(groups_print_activity_menu($cm, $returnurl, true), 'mb-3');
+        }
+
         // Search for entries.
         list($records, $maxcount, $totalcount, $page, $nowperpage, $sort, $mode) =
             data_search_entries($data, $cm, $context, $mode, $currentgroup, $search, $sort, $order, $page, $perpage, $advanced, $search_array, $record);
@@ -398,12 +404,6 @@ if ($showactivity) {
         $actionbar = new \mod_data\output\action_bar($data->id, $pageurl);
         echo $actionbar->get_view_action_bar($hasrecords, $mode);
 
-        if ($groupmode) {
-            $returnurl = new moodle_url('/mod/data/view.php', ['d' => $data->id, 'mode' => $mode, 'search' => s($search),
-                'sort' => s($sort), 'order' => s($order)]);
-            echo html_writer::div(groups_print_activity_menu($cm, $returnurl, true), 'mb-3');
-        }
-
         // Advanced search form doesn't make sense for single (redirects list view).
         if ($maxcount && $mode != 'single') {
             data_print_preference_form($data, $perpage, $search, $sort, $order, $search_array, $advanced, $mode);