Handle errors when a resource fails to install

This commit is contained in:
Djamil Legato
2016-09-24 21:22:18 -07:00
parent 0a2b1d790f
commit 4cd6b52fb0
3 changed files with 20 additions and 4 deletions

View File

@@ -1,6 +1,8 @@
# v1.2.x
## 09/xx/2016
1. [](#improved)
* Handle errors when a resource fails to install
1. [](#bugfix)
* Fix [#1034](https://github.com/getgrav/grav/issues/1034) redirect of page creation procedure when system.home.hide_in_urls is enabled
* Media (Page): Do not extend parent metehod for sending files since Safari and IE API for FormData dont implement `delete` ([#772](https://github.com/getgrav/grav-plugin-admin/issues/772))

View File

@@ -339,13 +339,20 @@ class Packages {
$('[data-packages-modal] .install-dependencies-package-container').addClass('hidden');
$('[data-packages-modal] .installing-dependencies').removeClass('hidden');
this.installDependenciesOfPackages(type, slugs, () => {
this.installDependenciesOfPackages(type, slugs, (response) => {
$('[data-packages-modal] .installing-dependencies').addClass('hidden');
$('[data-packages-modal] .installing-package').removeClass('hidden');
this.installPackages(type, slugs, () => {
$('[data-packages-modal] .installing-package').addClass('hidden');
$('[data-packages-modal] .installation-complete').removeClass('hidden');
if (response.status === 'error') {
let remodal = $.remodal.lookup[$('[data-packages-modal]').data('remodal')];
remodal.close();
return;
}
if (slugs.length === 1) {
global.location.href = `${config.base_url_relative}/${type}s/${slugs[0]}`;
} else {
@@ -364,10 +371,17 @@ class Packages {
$('[data-packages-modal] .install-package-container').addClass('hidden');
$('[data-packages-modal] .installing-package').removeClass('hidden');
this.installPackages(type, slugs, () => {
this.installPackages(type, slugs, (response) => {
$('[data-packages-modal] .installing-package').addClass('hidden');
$('[data-packages-modal] .installation-complete').removeClass('hidden');
if (response.status === 'error') {
let remodal = $.remodal.lookup[$('[data-packages-modal]').data('remodal')];
remodal.close();
return;
}
if (slugs.length === 1) {
global.location.href = `${config.base_url_relative}/${type}s/${slugs[0]}`;
} else {

File diff suppressed because one or more lines are too long