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

Allow setting memory limit to 0 for default

Browse Source 
Part of #18
This commit is contained in:
Girish Ramakrishnan
2016-09-04 11:44:29 -07:00
parent 31636af643
commit 4a827dcfb3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@
<label class="control-label hand" data-toggle="collapse" data-target="#appConfigureCollapseAdvanced">Show advanced</label>
<div class="collapse" id="appConfigureCollapseAdvanced">
<div class="form-group">
<label class="control-label" for="memoryLimit">Maximum Memory Usage: <b>{{ appConfigure.memoryLimit / 1024 / 1024 }} MB</b></label>
<label class="control-label" for="memoryLimit">Maximum Memory Usage: <b>{{ appConfigure.memoryLimit ? appConfigure.memoryLimit / 1024 / 1024 + 'MB' : 'Default' }}</b></label>
<br/>
<div style="padding: 0 10px;">
<slider id="memoryLimit" ng-model="appConfigure.memoryLimit" step="33554432" tooltip="hide" ticks="memoryTicks" ticks-snap-bounds="67108864"></slider>

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

@@ -11,6 +11,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$scope.users = [];
$scope.memoryTicks = [
0, // result to default memory limit
256 * 1024 * 1024,
512 * 1024 * 1024,
1024 * 1024 * 1024,
@@ -179,7 +180,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.memoryLimit = app.memoryLimit || 256;
$scope.appConfigure.memoryLimit = app.memoryLimit;
$scope.appConfigure.xFrameOptions = app.xFrameOptions.indexOf('ALLOW-FROM') === 0 ? app.xFrameOptions.split(' ')[1] : '';
// fill the portBinding structures. There might be holes in the app.portBindings, which signalizes a disabled port