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

memoryUsage -> memoryLimit

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-09-04 11:47:27 -07:00
parent b4bd6500a3
commit 31636af643
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,10 +102,10 @@
<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="memoryUsage">Maximum Memory Usage: <b>{{ appConfigure.memoryUsage / 1024 / 1024 }} MB</b></label>
<label class="control-label" for="memoryLimit">Maximum Memory Usage: <b>{{ appConfigure.memoryLimit / 1024 / 1024 }} MB</b></label>
<br/>
<div style="padding: 0 10px;">
<slider id="memoryUsage" ng-model="appConfigure.memoryUsage" step="33554432" tooltip="hide" ticks="memoryTicks" ticks-snap-bounds="67108864"></slider>
<slider id="memoryLimit" ng-model="appConfigure.memoryLimit" step="33554432" tooltip="hide" ticks="memoryTicks" ticks-snap-bounds="67108864"></slider>
</div>
</div>

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

@@ -179,7 +179,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;
$scope.appConfigure.memoryLimit = app.memoryLimit || 256;
$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