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

remove singleUser from ui code

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-11-11 22:12:48 +05:30
parent 2065a5f7f2
commit 72f31744e3
3 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,14 +66,6 @@
<br/>
<div class="form-group" ng-show="appConfigure.app.manifest.singleUser">
<label class="control-label">User</label>
<p>
This is a single user application.<br/><br/>
Access is granted to <b>{{ renderAccessRestrictionUser(appConfigure.app.accessRestriction.users[0]) }}</b>.
</p>
</div>
<div class="form-group" ng-show="appConfigure.app.manifest.customAuth">
<label class="control-label">Access control</label>
<p>
@@ -89,7 +81,7 @@
</p>
</div>
<div class="form-group" ng-hide="appConfigure.app.manifest.singleUser || appConfigure.app.manifest.customAuth || appConfigure.app.manifest.addons.email">
<div class="form-group" ng-hide="appConfigure.app.manifest.customAuth || appConfigure.app.manifest.addons.email">
<label class="control-label">Access control</label>
<div class="radio" ng-show="appConfigure.needsOAuthProxy">
<label>

7
webadmin/src/views/appstore.html
View File

@@ -35,11 +35,6 @@
</ng-form>
</div>
<div class="form-group" ng-show="appInstall.app.manifest.singleUser">
<label class="control-label">User</label>
<select class="form-control" ng-model="appInstall.accessRestrictionSingleUser" ng-options="user as (user.username || user.email) for user in users track by user.id" ng-required="appInstall.app.manifest.singleUser"></select>
</div>
<div class="form-group" ng-show="appInstall.app.manifest.customAuth">
<label class="control-label">Access control</label>
<p>
@@ -55,7 +50,7 @@
</p>
</div>
<div class="form-group" ng-hide="appInstall.app.manifest.singleUser || appInstall.app.manifest.customAuth || appInstall.app.manifest.addons.email">
<div class="form-group" ng-hide="appInstall.app.manifest.customAuth || appInstall.app.manifest.addons.email">
<label class="control-label">Access control</label>
<div class="radio">
<label>

9
webadmin/src/views/appstore.js
View File

@@ -36,7 +36,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
keyFileName: '',
accessRestrictionOption: 'any',
accessRestriction: { users: [], groups: [] },
accessRestrictionSingleUser: null,
needsOAuthProxy: false,
optionalSso: false,
@@ -66,7 +65,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
$scope.appInstall.keyFileName = '';
$scope.appInstall.accessRestrictionOption = 'any';
$scope.appInstall.accessRestriction = { users: [], groups: [] };
$scope.appInstall.accessRestrictionSingleUser = null;
$scope.appInstall.needsOAuthProxy = false;
$scope.appInstall.optionalSso = false;
@@ -108,7 +106,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
$scope.appInstall.portBindingsEnabled = {}; // This is the actual model holding the enabled/disabled flag
$scope.appInstall.accessRestrictionOption = app.accessRestriction ? 'groups' : 'any';
$scope.appInstall.accessRestriction = app.accessRestriction || { users: [], groups: [] };
$scope.appInstall.accessRestrictionSingleUser = null;
var manifest = app.manifest;
$scope.appInstall.needsOAuthProxy = !(manifest.addons['ldap'] || manifest.addons['oauth'] || manifest.addons['simpleauth'] || manifest.addons['email'] || manifest.customAuth);
@@ -139,9 +136,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
}
// translate to accessRestriction object
var accessRestriction = $scope.appInstall.app.manifest.singleUser ? {
users: [ $scope.appInstall.accessRestrictionSingleUser.id ]
} : ($scope.appInstall.accessRestrictionOption === 'groups' ? $scope.appInstall.accessRestriction : null);
var accessRestriction = $scope.appInstall.accessRestrictionOption === 'groups' ? $scope.appInstall.accessRestriction : null;
var data = {
location: $scope.appInstall.location || '',
@@ -149,7 +144,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
accessRestriction: accessRestriction,
cert: $scope.appInstall.certificateFile,
key: $scope.appInstall.keyFile,
oauthProxy: $scope.appInstall.needsOAuthProxy && ($scope.appInstall.app.manifest.singleUser || $scope.appInstall.accessRestrictionOption !== 'unrestricted'),
oauthProxy: $scope.appInstall.needsOAuthProxy && $scope.appInstall.accessRestrictionOption !== 'unrestricted',
sso: $scope.appInstall.optionalSso && $scope.appInstall.accessRestriction == 'nosso'
};