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

Allow to set app label

Browse Source
This commit is contained in:
Johannes Zellner
2019-04-24 14:25:37 +02:00
parent 2ec5a2acff
commit 165cc279de
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/apps.html
+13 -5
View File
@@ -98,12 +98,20 @@
<br/>
<br/>
</div>
</uib-tab>
<div class="form-group">
<label class="control-label">Tags</label>
<tag-input class="form-control" placeholder="Add tags" taglist="appConfigure.tags" name="tags" uib-tooltip="For grouping in the dashboard"></tag-input>
</div>
<uib-tab index="'display'" heading="Display">
<br/>
<p>This information is for the app display in the dashboard.</p>
<div class="form-group" ng-class="{ 'has-error': !appConfigureForm.label.$dirty && appConfigure.error.label }">
<label class="control-label">Label</label>
<div class="control-label" ng-show="appConfigure.error.label">{{appConfigure.error.label}}</div>
<input type="text" class="form-control" id="appConfigureLabelInput" name="label" ng-model="appConfigure.label">
</div>
<div class="form-group">
<label class="control-label">Tags</label>
<tag-input class="form-control" placeholder="Add tags" taglist="appConfigure.tags" name="tags" uib-tooltip="For grouping in the dashboard"></tag-input>
</div>
</uib-tab>
<uib-tab index="'advanced'" heading="Advanced">
src/views/apps.js
+4 -1
View File
@@ -38,7 +38,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
memoryLimit: 0,
memoryTicks: [],
mailboxName: '',
accessRestrictionOption: 'any',
accessRestriction: { users: [], groups: [] },
xFrameOptions: '',
@@ -50,6 +49,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
alternateDomain: null,
ssoAuth: false,
tags: '',
label: '',
action: 'general',
@@ -82,6 +82,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$scope.appConfigure.enableAutomaticUpdate = app.enableAutomaticUpdate;
$scope.appConfigure.mailboxNameEnabled = app.mailboxName && (app.mailboxName.match(/\.app$/) === null);
$scope.appConfigure.mailboxName = app.mailboxName || '';
$scope.appConfigure.label = app.label || '';
$scope.appConfigure.ssoAuth = (app.manifest.addons['ldap'] || app.manifest.addons['oauth']) && app.sso;
@@ -131,6 +132,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$scope.appConfigure.error.other = null;
$scope.appConfigure.error.location = null;
$scope.appConfigure.error.xFrameOptions = null;
$scope.appConfigure.error.label = null;
$scope.appConfigure.error.dataDir = null;
$scope.appConfigure.error.alternateDomains = null;
$scope.appConfigure.error.mailboxName = null;
@@ -163,6 +165,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
enableBackup: $scope.appConfigure.enableBackup,
enableAutomaticUpdate: $scope.appConfigure.enableAutomaticUpdate,
alternateDomains: [],
label: $scope.appConfigure.label,
tags: $scope.appConfigure.tags.split(',').map(function (t) { return t.trim(); }).filter(function (t) { return !!t; }),
dataDir: $scope.appConfigure.dataDirEnabled ? $scope.appConfigure.dataDir : ''
};