jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Ensure we deal with byte values for memoryLimit

Browse Source
This commit is contained in:
Johannes Zellner
2016-02-11 17:29:00 +01:00
parent 75d22d7988
commit 8c6f655628
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webadmin/src/js/client.js
View File

@@ -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) {

6
webadmin/src/views/apps.html
View File

@@ -72,11 +72,11 @@
</select>
</div>
<div class="form-group" ng-hide="true">
<label class="control-label" for="memoryUsage">Maximum Memory Usage: <b>{{ appConfigure.memoryUsage }} MB</b></label>
<div class="form-group">
<label class="control-label" for="memoryUsage">Maximum Memory Usage: <b>{{ appConfigure.memoryUsage / 1024 / 1024 }} MB</b></label>
<br/>
<div style="padding: 0 10px;">
<slider id="memoryUsage" ng-model="appConfigure.memoryUsage" min="0" step="32" max="100" tooltip="hide" ticks="memoryTicks" ticks-snap-bounds="64"></slider>
<slider id="memoryUsage" ng-model="appConfigure.memoryUsage" step="33554432" tooltip="hide" ticks="memoryTicks" ticks-snap-bounds="67108864"></slider>
</div>
</div>

13
webadmin/src/views/apps.js
View File

@@ -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) {