MDL-68558 admin: Allow to go back to plugins check page on failed deps

Once the admin reaches the Plugin dependencies check with a failed plugin dependency, the "Continue" button should take him/her to the previous page where the dependency can be sorted out, or the plugin installation cancelled. Also the "Cancel this installation" should work on this page, too. None of this was happening correctly because the page with failed dependencies is loaded with "confirmplugincheck" set to 1 as a result of confirming the previous step. We must explicitly override it back to 0 to navigate the user back to the previous step.
mvaraujo · Jul 23, 2020 · 9d17179 · 9d17179
1 parent 741d6dd
commit 9d17179
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/admin/index.php b/admin/index.php
@@ -509,7 +509,8 @@
         // Always verify plugin dependencies!
         $failed = array();
         if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
-            echo $output->unsatisfied_dependencies_page($version, $failed, $PAGE->url);
+            echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
+                array('confirmplugincheck' => 0)));
             die();
         }
         unset($failed);
@@ -701,7 +702,8 @@
         $failed = array();
         if (!$pluginman->all_plugins_ok($version, $failed, $CFG->branch)) {
             $output = $PAGE->get_renderer('core', 'admin');
-            echo $output->unsatisfied_dependencies_page($version, $failed, $PAGE->url);
+            echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
+                array('confirmplugincheck' => 0)));
             die();
         }
         unset($failed);

diff --git a/admin/renderer.php b/admin/renderer.php
@@ -1110,7 +1110,7 @@ public function plugins_check_table(core_plugin_manager $pluginman, $version, ar
 
                 if (!empty($installabortable[$plugin->component])) {
                     $status .= $this->output->single_button(
-                        new moodle_url($this->page->url, array('abortinstall' => $plugin->component)),
+                        new moodle_url($this->page->url, array('abortinstall' => $plugin->component, 'confirmplugincheck' => 0)),
                         get_string('cancelinstallone', 'core_plugin'),
                         'post',
                         array('class' => 'actionbutton cancelinstallone d-block mt-1')
@@ -1209,7 +1209,7 @@ public function plugins_check_table(core_plugin_manager $pluginman, $version, ar
 
         if ($installabortable) {
             $out .= $this->output->single_button(
-                new moodle_url($this->page->url, array('abortinstallx' => 1)),
+                new moodle_url($this->page->url, array('abortinstallx' => 1, 'confirmplugincheck' => 0)),
                 get_string('cancelinstallall', 'core_plugin', count($installabortable)),
                 'post',
                 array('class' => 'singlebutton cancelinstallall mr-1')