From 94d7bc5328e8e9e2e6d6219833dedcadd84b4c4d Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Thu, 6 Apr 2017 17:39:43 +0200
Subject: [PATCH] Ensure the app install dialog closes and releases the
 backdrop when moving to other views

Fixes #201
---
 webadmin/src/views/appstore.html |  4 ++--
 webadmin/src/views/appstore.js   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index ba8db29db..e2b0c6751 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -76,7 +76,7 @@
                                     Only allow the following user groups <span class="label label-danger" ng-show="appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()">Select at least one group</span>
                                 </label>
                             </div>
-                            <div ng-show="groups.length <= 1" style="margin-left: 20px;">No groups available. <a href="#/users">Create groups</a></div>
+                            <div ng-show="groups.length <= 1" style="margin-left: 20px;">No groups available. <a href="" ng-click="showView('/users')">Create groups</a></div>
                             <div>
                                 <div style="margin-left: 20px;">
                                     <span ng-repeat="group in groups | ignoreAdminGroup">
@@ -139,7 +139,7 @@
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" ng-show="appInstall.state !== 'postInstall'" data-dismiss="modal">Close</button>
                 <button type="button" class="btn btn-default" ng-show="appInstall.state === 'postInstall'" data-dismiss="modal" ng-click="appInstall.switchToAppsView()">Got it</button>
-                <button type="button" class="btn btn-success" ng-show="config.provider === 'caas' && user.admin && appInstall.state === 'resourceConstraint'" ng-click="showRequestUpgrade()">Upgrade Cloudron</button>
+                <button type="button" class="btn btn-success" ng-show="config.provider === 'caas' && user.admin && appInstall.state === 'resourceConstraint'" ng-click="showView('/settings')">Upgrade Cloudron</button>
                 <button type="button" class="btn btn-danger" ng-show="(config.isDev || config.provider !== 'caas') && user.admin && appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
                 <button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo' && user.admin" ng-click="appInstall.showForm()">Install</button>
                 <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm' && user.admin" ng-click="appInstall.submit()" ng-disabled="appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-o-notch fa-spin" ng-show="appInstall.busy"></i> Install</button>
diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js
index 44be9ef7c..e120db7c4 100644
--- a/webadmin/src/views/appstore.js
+++ b/webadmin/src/views/appstore.js
@@ -20,15 +20,15 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
     $scope.appstoreConfig = null;
     $scope.mailConfig = {};
 
-    $scope.showRequestUpgrade = function () {
+    $scope.showView = function (view) {
         // wait for dialog to be fully closed to avoid modal behavior breakage when moving to a different view already
-        $('#appInstallModal').on('hidden.bs.modal', function () {
+        $('.modal').on('hidden.bs.modal', function () {
             $scope.appInstall.reset();
-            $('#appInstallModal').off('hidden.bs.modal');
-            $location.path('/settings');
+            $('.modal').off('hidden.bs.modal');
+            $location.path(view);
         });
 
-        $('#appInstallModal').modal('hide');
+        $('.modal').modal('hide');
     };
 
     $scope.appInstall = {