mirror of
https://github.com/moodle/moodle.git
synced 2025-04-21 00:12:56 +02:00
Merge branch 'MDL-78149' of https://github.com/paulholden/moodle
This commit is contained in:
commit
99e8362272
@ -386,6 +386,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);
|
||||
@ -402,12 +408,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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user