From 1da2ce7e8cedd265ee013733ade8514866fbdce1 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 11 Mar 2016 15:17:18 +0100
Subject: [PATCH] Detect error while installing packages, show message and
 cancel button

---
 classes/controller.php                                 |  3 ---
 themes/grav/app/utils/packages.js                      |  9 ++++++---
 .../templates/partials/modal-add-package.html.twig     | 10 ++++++++++
 .../templates/partials/modal-update-packages.html.twig | 10 ++++++++++
 4 files changed, 26 insertions(+), 6 deletions(-)

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 @@
                 </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..
diff --git a/themes/grav/templates/partials/modal-update-packages.html.twig b/themes/grav/templates/partials/modal-update-packages.html.twig
index 26359050..75ec0195 100644
--- a/themes/grav/templates/partials/modal-update-packages.html.twig
+++ b/themes/grav/templates/partials/modal-update-packages.html.twig
@@ -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..