From b57d3e7e34d98042533369790d9f51462b04f9c0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Dec 2013 11:01:37 -0500
Subject: [PATCH] Fix NPE in getting a user's fork if repository caching is disabled
---
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