diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js index f5b499fd0..db83b39ba 100644 --- a/webadmin/src/js/client.js +++ b/webadmin/src/js/client.js @@ -294,7 +294,8 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification', accessRestriction: config.accessRestriction, oauthProxy: config.oauthProxy, cert: config.cert, - key: config.key + key: config.key, + memoryLimit: config.memoryLimit }; $http.post(client.apiOrigin + '/api/v1/apps/' + id + '/configure', data).success(function (data, status) { diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html index 56d065e70..c70c4d043 100644 --- a/webadmin/src/views/apps.html +++ b/webadmin/src/views/apps.html @@ -72,11 +72,11 @@ -
- +
+
- +
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js index 3ecef0025..3b46cbea9 100644 --- a/webadmin/src/views/apps.js +++ b/webadmin/src/views/apps.js @@ -9,7 +9,13 @@ angular.module('Application').controller('AppsController', ['$scope', '$location $scope.user = Client.getUserInfo(); $scope.groups = []; - $scope.memoryTicks = [256, 512, 1024, 2048, 4096]; + $scope.memoryTicks = [ + 256 * 1024 * 1024, + 512 * 1024 * 1024, + 1024 * 1024 * 1024, + 2048 * 1024 * 1024, + 4096 * 1024 * 1024 + ]; $scope.appConfigure = { busy: false, @@ -25,7 +31,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location certificateFileName: '', keyFile: null, keyFileName: '', - memoryLimit: 256, + memoryLimit: $scope.memoryTicks[0], accessRestrictionOption: '', accessRestriction: { users: [], groups: [] } }; @@ -70,7 +76,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location $scope.appConfigure.certificateFileName = ''; $scope.appConfigure.keyFile = null; $scope.appConfigure.keyFileName = ''; - $scope.appConfigure.memoryLimit = 256; + $scope.appConfigure.memoryLimit = $scope.memoryTicks[0]; $scope.appConfigure.accessRestrictionOption = ''; $scope.appConfigure.accessRestriction = { users: [], groups: [] }; @@ -187,6 +193,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location accessRestriction: !$scope.appConfigure.accessRestrictionOption ? null : $scope.appConfigure.accessRestriction, cert: $scope.appConfigure.certificateFile, key: $scope.appConfigure.keyFile, + memoryLimit: $scope.appConfigure.memoryLimit }; Client.configureApp($scope.appConfigure.app.id, $scope.appConfigure.password, data, function (error) {