Improvement: Switch between report contexts within report and fix req…

…uire_login in system scope. #721
Wunderbyte-GmbH · Jan 27, 2025 · 78fc295 · 78fc295
1 parent ee06455
commit 78fc295
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/classes/table/manageusers_table.php b/classes/table/manageusers_table.php
@@ -121,16 +121,25 @@ public function col_option(stdClass $values) {
             ]
         );
 
+        $report2link = new moodle_url(
+            '/mod/booking/report2.php',
+            [
+                'cmid' => $values->cmid,
+                'optionid' => $values->optionid,
+            ]
+        );
+
         $instancelink = new moodle_url(
-            '/mod/booking/view.php',
-            ['id' => $values->cmid]
+            '/mod/booking/report2.php',
+            ['cmid' => $values->cmid]
         );
 
         $data = [
             'id' => $values->id,
             'titleprefix' => $values->titleprefix,
             'title' => $values->text,
             'optionlink' => $optionlink->out(false),
+            'report2link' => $report2link->out(false),
             'instancename' => $values->instancename,
             'instancelink' => $instancelink->out(false),
             'teachers' => $teachers,

diff --git a/report2.php b/report2.php
@@ -170,7 +170,7 @@
         "</a>";
 } else {
     $scopes = ['system'];
-    require_login(0, false);
+    require_login(1, false);
     $scope = 'system'; // The whole site.
     $scopeid = 0;
     $urlparams = []; // For PAGE url.

diff --git a/templates/report/option.mustache b/templates/report/option.mustache
@@ -36,7 +36,12 @@
 <div class="mod-booking-report-option ml-3">
 	<div>
 		<div class="h6 mb-1">
-			<a href="{{optionlink}}" target="_blank">{{#titleprefix}}{{.}} - {{/titleprefix}}{{title}}</a>
+			<a href="{{report2link}}" target="_blank">
+				<i class="fa fa-fw fa-ticket" aria-hidden="true"></i>&nbsp;{{#titleprefix}}{{.}} - {{/titleprefix}}{{title}}
+			</a>&nbsp;
+			<a href="{{optionlink}}" target="_blank">
+				<i class="fa fa-fw fa-external-link" aria-hidden="true"></i>
+			</a>
 			<span class="ml-1"><a class="btn btn-link btn-sm" data-toggle="collapse" href="#collapseoptionshortinfo-{{id}}"
 				role="button" aria-expanded="false" aria-controls="collapseoptionshortinfo-{{id}}">
 				<i class="fa fa-chevron-down" aria-hidden="true"></i>