From 380afada1de5b97284704163638aafea5f0f0b0d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 May 2012 09:16:14 -0400
Subject: [PATCH] Changed constants and fixed nullpointer in update repository

---
 src/com/gitblit/client/RepositoriesPanel.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/com/gitblit/client/RepositoriesPanel.java b/src/com/gitblit/client/RepositoriesPanel.java
index 2994b76..89ec605 100644
--- a/src/com/gitblit/client/RepositoriesPanel.java
+++ b/src/com/gitblit/client/RepositoriesPanel.java
@@ -27,6 +27,7 @@
 import java.awt.event.MouseEvent;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.swing.JButton;
@@ -44,7 +45,9 @@
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableRowSorter;
 
+import com.gitblit.Constants;
 import com.gitblit.Constants.RpcRequest;
+import com.gitblit.Keys;
 import com.gitblit.models.FeedModel;
 import com.gitblit.models.RepositoryModel;
 import com.gitblit.utils.StringUtils;
@@ -357,8 +360,11 @@
 		dialog.setTeams(gitblit.getTeamnames(), null);
 		dialog.setRepositories(gitblit.getRepositories());
 		dialog.setFederationSets(gitblit.getFederationSets(), null);
-		dialog.setPreReceiveScripts(gitblit.getAvailableScripts(), null);
-		dialog.setPostReceiveScripts(gitblit.getAvailableScripts(), null);
+		dialog.setIndexedBranches(new ArrayList<String>(Arrays.asList(Constants.DEFAULT_BRANCH)), null);
+		dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(null),
+				gitblit.getPreReceiveScriptsInherited(null), null);
+		dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(null),
+				gitblit.getPostReceiveScriptsInherited(null), null);
 		dialog.setVisible(true);
 		final RepositoryModel newRepository = dialog.getRepository();
 		final List<String> permittedUsers = dialog.getPermittedUsers();
@@ -417,8 +423,15 @@
 		dialog.setTeams(gitblit.getTeamnames(), gitblit.getPermittedTeamnames(repository));
 		dialog.setRepositories(gitblit.getRepositories());
 		dialog.setFederationSets(gitblit.getFederationSets(), repository.federationSets);
-		dialog.setPreReceiveScripts(gitblit.getAvailableScripts(), repository.preReceiveScripts);
-		dialog.setPostReceiveScripts(gitblit.getAvailableScripts(), repository.postReceiveScripts);
+		List<String> allLocalBranches = new ArrayList<String>();
+		allLocalBranches.add(Constants.DEFAULT_BRANCH);
+		allLocalBranches.addAll(repository.getLocalBranches());
+		dialog.setIndexedBranches(allLocalBranches, repository.indexedBranches);
+		dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(repository),
+				gitblit.getPreReceiveScriptsInherited(repository), repository.preReceiveScripts);
+		dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(repository),
+				gitblit.getPostReceiveScriptsInherited(repository), repository.postReceiveScripts);
+		dialog.setCustomFields(repository, gitblit.getSettings().get(Keys.repository.customFields).getStrings());
 		dialog.setVisible(true);
 		final RepositoryModel revisedRepository = dialog.getRepository();
 		final List<String> permittedUsers = dialog.getPermittedUsers();

--
Gitblit v1.9.1