diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html index cc4e49654..b2dbc8047 100644 --- a/webadmin/src/views/appstore.html +++ b/webadmin/src/views/appstore.html @@ -80,12 +80,13 @@
-

Not enough resources left to install this application.

-

The Cloudron's resources can be extended with a model upgrade or available resources may be freed up by uninstalling unused applications.

+

This Cloudron is running low on resources.

+

Installing this app might decrease the performance of other apps. The Cloudron's resources can be extended with a model upgrade or available resources may be freed up by uninstalling unused applications.

diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js index 31a572b84..a77b46ea7 100644 --- a/webadmin/src/views/appstore.js +++ b/webadmin/src/views/appstore.js @@ -157,13 +157,16 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca $scope.appInstallForm.$setUntouched(); }; - $scope.showInstallForm = function () { - if (Client.enoughResourcesAvailable($scope.appInstall.app)) { + $scope.showInstallForm = function (force) { + if (Client.enoughResourcesAvailable($scope.appInstall.app) || force) { $scope.appInstall.installFormVisible = true; + $scope.appInstall.resourceConstraintVisible = false; $('#collapseMediaLinksCarousel').collapse('hide'); + $('#collapseResourceConstraint').collapse('hide'); $('#collapseInstallForm').collapse('show'); $('#appInstallLocationInput').focus(); } else { + $scope.appInstall.installFormVisible = false; $scope.appInstall.resourceConstraintVisible = true; $('#collapseMediaLinksCarousel').collapse('hide'); $('#collapseResourceConstraint').collapse('show');