From 0fe9792a9f194e68288c377810c33973d117923f Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 13 Dec 2013 08:12:47 -0500 Subject: [PATCH] Use multiple mappings for the git servlet instead of multiple instances --- 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 4f548d4..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().gitblit().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