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

Force the user to set at least one access restriction group

Browse Source
This commit is contained in:
Johannes Zellner
2016-02-19 18:02:51 +01:00
parent 86f14b0149
commit 0621c135bc
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webadmin/src/views/apps.html
+3 -2
View File
@@ -57,6 +57,7 @@
Restrict to groups Restrict to groups
</label> </label>
</div> </div>
<div class="has-error" ng-show="appConfigure.accessRestrictionOption !== '' && !appConfigure.isAccessRestrictionValid()">Select at least one group</div>
<div> <div>
<div> <div>
<span> <span>
@@ -111,13 +112,13 @@
</div> </div>
<input type="password" class="form-control" ng-model="appConfigure.password" id="appConfigurePasswordInput" name="password" required> <input type="password" class="form-control" ng-model="appConfigure.password" id="appConfigurePasswordInput" name="password" required>
</div> </div>
<input class="ng-hide" type="submit" ng-disabled="appConfigureForm.$invalid || busy"/> <input class="ng-hide" type="submit" ng-disabled="appConfigureForm.$invalid || busy || (appConfigure.accessRestrictionOption !== '' && !appConfigure.isAccessRestrictionValid())"/>
</form> </form>
</fieldset> </fieldset>
</div> </div>
<div class="modal-footer "> <div class="modal-footer ">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success" ng-click="doConfigure()" ng-disabled="appConfigureForm.$invalid || appConfigure.busy"><i class="fa fa-spinner fa-pulse" ng-show="appConfigure.busy"></i> Save</button> <button type="button" class="btn btn-success" ng-click="doConfigure()" ng-disabled="appConfigureForm.$invalid || appConfigure.busy || (appConfigure.accessRestrictionOption !== '' && !appConfigure.isAccessRestrictionValid())"><i class="fa fa-spinner fa-pulse" ng-show="appConfigure.busy"></i> Save</button>
</div> </div>
</div> </div>
</div> </div>
webadmin/src/views/apps.js
+6 -1
View File
@@ -32,7 +32,12 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
keyFileName: '', keyFileName: '',
memoryLimit: $scope.memoryTicks[0], memoryLimit: $scope.memoryTicks[0],
accessRestrictionOption: '', accessRestrictionOption: '',
accessRestriction: { users: [], groups: [] } accessRestriction: { users: [], groups: [] },
isAccessRestrictionValid: function () {
var tmp = $scope.appConfigure.accessRestriction;
return !!(tmp.users.length || tmp.groups.length);
}
}; };
$scope.appUninstall = { $scope.appUninstall = {