From 8a8bc3dc1bc810cef952a12071b6ec7dd8ff9750 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 20 Oct 2014 09:33:07 -0400 Subject: [PATCH] Prepare v1.6.1 documentation updates --- src/main/java/com/gitblit/wicket/pages/EditUserPage.java | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java index 15c35fa..454aa61 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java +++ b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java @@ -239,10 +239,35 @@ form.add(confirmPasswordField.setEnabled(editCredentials)); form.add(new TextField<String>("displayName").setEnabled(editDisplayName)); form.add(new TextField<String>("emailAddress").setEnabled(editEmailAddress)); - form.add(new CheckBox("canAdmin")); - form.add(new CheckBox("canFork").setEnabled(app().settings().getBoolean(Keys.web.allowForking, true))); - form.add(new CheckBox("canCreate")); + + if (userModel.canAdmin() && !userModel.canAdmin) { + // user inherits Admin permission + // display a disabled-yet-checked checkbox + form.add(new CheckBox("canAdmin", Model.of(true)).setEnabled(false)); + } else { + form.add(new CheckBox("canAdmin")); + } + + if (userModel.canFork() && !userModel.canFork) { + // user inherits Fork permission + // display a disabled-yet-checked checkbox + form.add(new CheckBox("canFork", Model.of(true)).setEnabled(false)); + } else { + final boolean forkingAllowed = app().settings().getBoolean(Keys.web.allowForking, true); + form.add(new CheckBox("canFork").setEnabled(forkingAllowed)); + } + + if (userModel.canCreate() && !userModel.canCreate) { + // user inherits Create permission + // display a disabled-yet-checked checkbox + form.add(new CheckBox("canCreate", Model.of(true)).setEnabled(false)); + } else { + form.add(new CheckBox("canCreate")); + } + form.add(new CheckBox("excludeFromFederation")); + form.add(new CheckBox("disabled")); + form.add(new RegistrantPermissionsPanel("repositories", RegistrantType.REPOSITORY, repos, permissions, getAccessPermissions())); form.add(teams.setEnabled(editTeams)); -- Gitblit v1.9.1