diff --git a/webadmin/src/3rdparty/bootstrap-slider/bootstrap-slider.js b/webadmin/src/3rdparty/bootstrap-slider/bootstrap-slider.js index dcd17e7ea..8fe3786d5 100644 --- a/webadmin/src/3rdparty/bootstrap-slider/bootstrap-slider.js +++ b/webadmin/src/3rdparty/bootstrap-slider/bootstrap-slider.js @@ -1,5 +1,5 @@ /*! ======================================================= - VERSION 6.0.12 + VERSION 6.0.12 ========================================================= */ "use strict"; diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html index 496b1dac8..56d065e70 100644 --- a/webadmin/src/views/apps.html +++ b/webadmin/src/views/apps.html @@ -73,10 +73,10 @@
- -

+ +
- +
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js index f01923386..3ecef0025 100644 --- a/webadmin/src/views/apps.js +++ b/webadmin/src/views/apps.js @@ -70,6 +70,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location $scope.appConfigure.certificateFileName = ''; $scope.appConfigure.keyFile = null; $scope.appConfigure.keyFileName = ''; + $scope.appConfigure.memoryLimit = 256; $scope.appConfigure.accessRestrictionOption = ''; $scope.appConfigure.accessRestriction = { users: [], groups: [] }; @@ -149,6 +150,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location $scope.appConfigure.portBindingsInfo = app.manifest.tcpPorts || {}; // Portbinding map only for information $scope.appConfigure.accessRestrictionOption = app.accessRestriction ? 'restricted' : ''; $scope.appConfigure.accessRestriction = app.accessRestriction || { users: [], groups: [] }; + $scope.appConfigure.memoryUsage = app.memoryUsage || 256; // fill the portBinding structures. There might be holes in the app.portBindings, which signalizes a disabled port for (var env in $scope.appConfigure.portBindingsInfo) {