From cca55e4722fa1ceba8a0933dda974162635f3955 Mon Sep 17 00:00:00 2001 From: John Crygier <john.crygier@aon.com> Date: Thu, 03 May 2012 12:48:16 -0400 Subject: [PATCH] Ability to get / set "custom" properties within a RepositoryModel. This makes getting specialized settings in hooks much easier. --- src/com/gitblit/GitBlit.java | 66 ++++++++++++++++++++++++++------- 1 files changed, 52 insertions(+), 14 deletions(-) diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index 6ed54dc..565b024 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -388,6 +388,22 @@ /** * + * @return true if the user service supports display name changes + */ + public boolean supportsDisplayNameChanges() { + return userService.supportsDisplayNameChanges(); + } + + /** + * + * @return true if the user service supports email address changes + */ + public boolean supportsEmailAddressChanges() { + return userService.supportsEmailAddressChanges(); + } + + /** + * * @return true if the user service supports team membership changes */ public boolean supportsTeamMembershipChanges() { @@ -480,6 +496,18 @@ userCookie.setPath("/"); response.addCookie(userCookie); } + } + + /** + * Logout a user. + * + * @param user + */ + public void logout(UserModel user) { + if (userService == null) { + return; + } + userService.logout(user); } /** @@ -1066,27 +1094,33 @@ config.setBoolean("gitblit", null, "showReadme", repository.showReadme); config.setBoolean("gitblit", null, "skipSizeCalculation", repository.skipSizeCalculation); config.setBoolean("gitblit", null, "skipSummaryMetrics", repository.skipSummaryMetrics); - config.setStringList("gitblit", null, "federationSets", repository.federationSets); config.setString("gitblit", null, "federationStrategy", repository.federationStrategy.name()); config.setBoolean("gitblit", null, "isFederated", repository.isFederated); - if (!ArrayUtils.isEmpty(repository.preReceiveScripts)) { - config.setStringList("gitblit", null, "preReceiveScript", repository.preReceiveScripts); - } - if (!ArrayUtils.isEmpty(repository.postReceiveScripts)) { - config.setStringList("gitblit", null, "postReceiveScript", - repository.postReceiveScripts); - } - if (!ArrayUtils.isEmpty(repository.mailingLists)) { - config.setStringList("gitblit", null, "mailingList", repository.mailingLists); - } - if (!ArrayUtils.isEmpty(repository.indexedBranches)) { - config.setStringList("gitblit", null, "indexBranch", repository.indexedBranches); - } + + updateList(config, "federationSets", repository.federationSets); + updateList(config, "preReceiveScript", repository.preReceiveScripts); + updateList(config, "postReceiveScript", repository.postReceiveScripts); + updateList(config, "mailingList", repository.mailingLists); + updateList(config, "indexBranch", repository.indexedBranches); + try { config.save(); } catch (IOException e) { logger.error("Failed to save repository config!", e); + } + } + + private void updateList(StoredConfig config, String field, List<String> list) { + // a null list is skipped, not cleared + // this is for RPC administration where an older manager might be used + if (list == null) { + return; + } + if (ArrayUtils.isEmpty(list)) { + config.unset("gitblit", null, field); + } else { + config.setStringList("gitblit", null, field, list); } } @@ -1762,6 +1796,10 @@ */ private ServerSettings loadSettingModels() { ServerSettings settingsModel = new ServerSettings(); + settingsModel.supportsCredentialChanges = userService.supportsCredentialChanges(); + settingsModel.supportsDisplayNameChanges = userService.supportsDisplayNameChanges(); + settingsModel.supportsEmailAddressChanges = userService.supportsEmailAddressChanges(); + settingsModel.supportsTeamMembershipChanges = userService.supportsTeamMembershipChanges(); try { // Read bundled Gitblit properties to extract setting descriptions. // This copy is pristine and only used for populating the setting -- Gitblit v1.9.1