Merge branch 'MDL-58835_master-fix' of git://github.com/dmonllao/moodle

hjlinde · Sep 13, 2017 · cf7430f · cf7430f
2 parents 59f431e + a6edbef
commit cf7430f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/admin/tool/analytics/classes/output/renderer.php b/admin/tool/analytics/classes/output/renderer.php
@@ -130,7 +130,7 @@ public function render_evaluate_results($results, $logs = array()) {
         }
 
         if (!CLI_SCRIPT) {
-            $output .= $OUTPUT->single_button(new \moodle_url('/admin/tool/analytics/index.php'), get_string('continue'));
+            $output .= $OUTPUT->single_button(new \moodle_url('/admin/tool/analytics/index.php'), get_string('continue'), 'get');
         }
 
         return $output;
@@ -200,7 +200,7 @@ public function render_get_predictions_results($trainresults = false, $trainlogs
         }
 
         if (!CLI_SCRIPT) {
-            $output .= $OUTPUT->single_button(new \moodle_url('/admin/tool/analytics/index.php'), get_string('continue'));
+            $output .= $OUTPUT->single_button(new \moodle_url('/admin/tool/analytics/index.php'), get_string('continue'), 'get');
         }
 
         return $output;

diff --git a/report/insights/amd/build/actions.min.js b/report/insights/amd/build/actions.min.js
diff --git a/report/insights/amd/src/actions.js b/report/insights/amd/src/actions.js
@@ -56,7 +56,7 @@ define(['jquery', 'core/ajax', 'core/notification'], function($, Ajax, Notificat
                         predictionContainers[0].remove();
 
                         // Move back if no remaining predictions.
-                        if ($('.insights-list tr').length === 0) {
+                        if ($('.insights-list tr').length < 2) {
                             window.history.back();
                         }
                     }).fail(Notification.exception);