From 565ee056cd74a119b6b7c108239a6470976d02b7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 28 Oct 2011 07:48:17 -0400
Subject: [PATCH] Bug fix to rss feed. Unit test for rss feed. Refactor ssl connection.
---
src/com/gitblit/client/GitblitPanel.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/client/GitblitPanel.java b/src/com/gitblit/client/GitblitPanel.java
index 1a24f71..23aadb8 100644
--- a/src/com/gitblit/client/GitblitPanel.java
+++ b/src/com/gitblit/client/GitblitPanel.java
@@ -530,11 +530,13 @@
Utils.packColumns(settingsTable, 5);
} else {
// remove the settings tab
- String settingsTitle = Translation.get("gb.settings");
- for (int i = 0; i < tabs.getTabCount(); i++) {
- if (tabs.getTitleAt(i).equals(settingsTitle)) {
- tabs.removeTabAt(i);
- break;
+ String[] titles = { Translation.get("gb.settings"), Translation.get("gb.status") };
+ for (String title : titles) {
+ for (int i = 0; i < tabs.getTabCount(); i++) {
+ if (tabs.getTitleAt(i).equals(title)) {
+ tabs.removeTabAt(i);
+ break;
+ }
}
}
}
@@ -683,6 +685,7 @@
dialog.setLocationRelativeTo(GitblitPanel.this);
dialog.setUsers(null, gitblit.getUsernames(), null);
dialog.setRepositories(gitblit.getRepositories());
+ dialog.setFederationSets(gitblit.getFederationSets(), null);
dialog.setVisible(true);
final RepositoryModel newRepository = dialog.getRepository();
final List<String> permittedUsers = dialog.getPermittedUsers();
--
Gitblit v1.9.1