From afaab55bf4f309382b55793db44033233dcfb64d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 30 Dec 2013 16:53:58 -0500
Subject: [PATCH] Support customizing the "from" display name for generated emails
---
src/main/java/com/gitblit/wicket/pages/EditTeamPage.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
index 32905c9..82b28fc 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
@@ -196,7 +196,11 @@
teamModel.postReceiveScripts.addAll(postReceiveScripts);
try {
- app().users().updateTeamModel(oldName, teamModel, isCreate);
+ if (isCreate) {
+ app().gitblit().addTeam(teamModel);
+ } else {
+ app().gitblit().reviseTeam(oldName, teamModel);
+ }
} catch (GitBlitException e) {
error(e.getMessage());
return;
@@ -216,7 +220,7 @@
form.add(new SimpleAttributeModifier("autocomplete", "off"));
// not all user services support manipulating team memberships
- boolean editMemberships = app().users().supportsTeamMembershipChanges(null);
+ boolean editMemberships = app().authentication().supportsTeamMembershipChanges(teamModel);
// field names reflective match TeamModel fields
form.add(new TextField<String>("name"));
--
Gitblit v1.9.1