diff --git a/src/views/apps.html b/src/views/apps.html index 57ee2909f..006e89b4f 100644 --- a/src/views/apps.html +++ b/src/views/apps.html @@ -98,12 +98,20 @@

+ -
- - -
- + +
+

This information is for the app display in the dashboard.

+
+ +
{{appConfigure.error.label}}
+ +
+
+ + +
diff --git a/src/views/apps.js b/src/views/apps.js index aff475afc..1ba560f20 100644 --- a/src/views/apps.js +++ b/src/views/apps.js @@ -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 : '' };