diff --git a/classes/controller.php b/classes/controller.php index e8797d9f..67c53f98 100644 --- a/classes/controller.php +++ b/classes/controller.php @@ -266,11 +266,8 @@ class AdminController $data = $this->post; $packages = isset($data['packages']) ? $data['packages'] : ''; $packages = (array)$packages; - $dependencies = $this->admin->getDependenciesNeededToInstall($packages); - $this->admin->json_response = ['status' => 'success', 'dependencies' => $dependencies]; - return true; } diff --git a/themes/grav/app/utils/packages.js b/themes/grav/app/utils/packages.js index a4bbf108..dfb15696 100644 --- a/themes/grav/app/utils/packages.js +++ b/themes/grav/app/utils/packages.js @@ -128,13 +128,15 @@ class Packages { } if (hasDependencies) { - $('.install-dependencies-package-container').removeClass('hidden'); + $('[data-packages-modal] .install-dependencies-package-container').removeClass('hidden'); } else { - $('.install-package-container').removeClass('hidden'); + $('[data-packages-modal] .install-package-container').removeClass('hidden'); } } else { - $('.install-package-container').removeClass('hidden'); + $('[data-packages-modal] .install-package-container').removeClass('hidden'); } + } else { + $('[data-packages-modal] .install-package-error').removeClass('hidden'); } }); } @@ -200,6 +202,7 @@ class Packages { $('[data-packages-modal] .installation-complete').addClass('hidden'); $('[data-packages-modal] .install-dependencies-package-container .button-bar').removeClass('hidden'); $('[data-packages-modal] .install-package-container .button-bar').removeClass('hidden'); + $('[data-packages-modal] .install-package-error').addClass('hidden'); this.getPackagesDependencies(type, slugs, () => { let slugs_string = slugs.join(); diff --git a/themes/grav/templates/partials/modal-add-package.html.twig b/themes/grav/templates/partials/modal-add-package.html.twig index bbc14eee..84bcacda 100644 --- a/themes/grav/templates/partials/modal-add-package.html.twig +++ b/themes/grav/templates/partials/modal-add-package.html.twig @@ -46,6 +46,16 @@ + + + +