Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-12-30 20:30:43 +01:00
Code Issues Packages Projects Releases Activity

Detect error while installing packages, show message and cancel button

Browse Source
This commit is contained in:
Flavio Copes
2016-03-11 15:17:18 +01:00
parent 6d25af2de9
commit 1da2ce7e8c
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
classes/controller.php
View File

@@ -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;
}

9
themes/grav/app/utils/packages.js
View File

@@ -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();

10
themes/grav/templates/partials/modal-add-package.html.twig
View File

@@ -46,6 +46,16 @@
</div>
</div>
<div class="install-package-error hidden">
<p>
Error while installing the package(s)
</p>
<div class="button-bar">
<button data-remodal-action="cancel" class="button secondary remodal-cancel"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN.CLOSE"|tu }}</button>
</div>
</div>
<div class="installing-dependencies hidden">
<p>
Installing dependencies..

10
themes/grav/templates/partials/modal-update-packages.html.twig
View File

@@ -46,6 +46,16 @@
</div>
</div>
<div class="install-package-error hidden">
<p>
Error while updating the package(s)
</p>
<div class="button-bar">
<button data-remodal-action="cancel" class="button secondary remodal-cancel"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN.CLOSE"|tu }}</button>
</div>
</div>
<div class="installing-dependencies hidden">
<p>
Installing dependencies..