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

Enable custom app data dir setting

Browse Source
This commit is contained in:
Johannes Zellner
2019-09-18 17:12:10 +02:00
parent 300ff09a47
commit 92257afdab
2 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/views/app.html
View File

@@ -382,7 +382,7 @@
<div class="row">
<div class="col-md-12">
<fieldset>
<form role="form" name="resourcesForm" ng-submit="resources.submit()" autocomplete="off">
<form role="form" name="resourcesForm" ng-submit="resources.submitMemoryLimit()" autocomplete="off">
<div class="form-group">
<label class="control-label" for="memoryLimit">Memory Limit <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#increasing-the-memory-limit-of-an-app" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup> : <b>{{ resources.memoryLimit ? resources.memoryLimit / 1024 / 1024 + 'MB' : 'Default (256 MB)' }}</b></label>
<br/>
@@ -391,14 +391,6 @@
</div>
</div>
<!-- We do not show this currently -->
<div ng-if="false" class="form-group" ng-class="{ 'has-error': !resourcesForm.dataDir.$dirty && resources.error.dataDir }">
<input type="checkbox" id="resourcesEnableDataDir" ng-model="resources.dataDirEnabled">
<label class="control-label" for="resourcesEnableDataDir">Custom Data Directory</label>
<div class="control-label" ng-show="resources.error.dataDir">{{resources.error.dataDir}}</div>
<input type="text" class="form-control" id="resourcesDataDirInput" name="dataDir" ng-disabled="!resources.dataDirEnabled" placeholder="/mnt/appdata" ng-model="resources.dataDir">
</div>
<input class="ng-hide" type="submit" ng-disabled="resources.memoryLimit === resources.currentMemoryLimit || resourcesForm.$invalid || resources.busy"/>
</form>
</fieldset>
@@ -406,7 +398,29 @@
</div>
<div class="row">
<div class="col-md-12 text-right">
<button class="btn btn-outline btn-primary pull-right" ng-click="resources.submit()" ng-disabled="resources.memoryLimit === resources.currentMemoryLimit || resources.$invalid || resources.busy"><i class="fa fa-circle-notch fa-spin" ng-show="resources.busy"></i> Save</button>
<button class="btn btn-outline btn-primary pull-right" ng-click="resources.submitMemoryLimit()" ng-disabled="resources.memoryLimit === resources.currentMemoryLimit || resourcesForm.$invalid || resources.busy"><i class="fa fa-circle-notch fa-spin" ng-show="resources.busy"></i> Save</button>
</div>
</div>
<hr/>
<div class="row">
<div class="col-md-12">
<fieldset>
<form role="form" name="resourcesDataDirForm" ng-submit="resources.submitDataDir()" autocomplete="off">
<div class="form-group" ng-class="{ 'has-error': resourcesDataDirForm.$dirty && resources.error.dataDir }">
<input type="checkbox" id="resourcesEnableDataDir" ng-model="resources.dataDirEnabled">
<label class="control-label" for="resourcesEnableDataDir">Custom Data Directory</label>
<div class="control-label" ng-show="resources.error.dataDir">{{ resources.error.dataDir }}</div>
<input type="text" class="form-control" name="dataDir" ng-disabled="!resources.dataDirEnabled" placeholder="/mnt/appdata" ng-model="resources.dataDir" ng-required="resources.dataDirEnabled">
</div>
<input class="ng-hide" type="submit" ng-disabled="!resourcesDataDirForm.$dirty || resourcesDataDirForm.$invalid || resources.busyDataDir"/>
</form>
</fieldset>
</div>
</div>
<div class="row">
<div class="col-md-12 text-right">
<button class="btn btn-outline btn-primary pull-right" ng-click="resources.submitDataDir()" ng-disabled="!resourcesDataDirForm.$dirty || resourcesDataDirForm.$invalid || resources.busyDataDir"><i class="fa fa-circle-notch fa-spin" ng-show="resources.busyDataDir"></i> Save</button>
</div>
</div>
</div>