From a5b1594130419c1523b3786d0bbb12adfd1e4d7b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 May 2012 17:34:17 -0400
Subject: [PATCH] Adjustments to custom fields in Manager
---
src/com/gitblit/client/RepositoriesPanel.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/client/RepositoriesPanel.java b/src/com/gitblit/client/RepositoriesPanel.java
index 89ec605..7cff4b6 100644
--- a/src/com/gitblit/client/RepositoriesPanel.java
+++ b/src/com/gitblit/client/RepositoriesPanel.java
@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import javax.swing.JButton;
import javax.swing.JLabel;
@@ -431,7 +432,10 @@
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());
+ if (gitblit.getSettings().hasKey(Keys.groovy.customFields)) {
+ Map<String, String> map = gitblit.getSettings().get(Keys.groovy.customFields).getMap();
+ dialog.setCustomFields(repository, map);
+ }
dialog.setVisible(true);
final RepositoryModel revisedRepository = dialog.getRepository();
final List<String> permittedUsers = dialog.getPermittedUsers();
--
Gitblit v1.9.1