From 7cd88ddbd93b115aeda76b87b1c99f9afa4aaaef Mon Sep 17 00:00:00 2001 From: Lukasz Jader <ljaderdev@gmail.com> Date: Sat, 14 Jul 2012 08:01:51 -0400 Subject: [PATCH] Fix some typos in polish translation --- src/com/gitblit/client/RepositoriesPanel.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/com/gitblit/client/RepositoriesPanel.java b/src/com/gitblit/client/RepositoriesPanel.java index 104010d..70b87c6 100644 --- a/src/com/gitblit/client/RepositoriesPanel.java +++ b/src/com/gitblit/client/RepositoriesPanel.java @@ -27,7 +27,9 @@ import java.awt.event.MouseEvent; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.swing.JButton; import javax.swing.JLabel; @@ -44,7 +46,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; @@ -248,7 +252,7 @@ repositoryControls.add(searchRepository); setLayout(new BorderLayout(Utils.MARGIN, Utils.MARGIN)); - header = new HeaderPanel(Translation.get("gb.repositories"), "gitweb-favicon.png"); + header = new HeaderPanel(Translation.get("gb.repositories"), "git-orange-16x16.png"); add(header, BorderLayout.NORTH); add(repositoryTablePanel, BorderLayout.CENTER); add(repositoryControls, BorderLayout.SOUTH); @@ -353,10 +357,12 @@ protected void createRepository() { EditRepositoryDialog dialog = new EditRepositoryDialog(gitblit.getProtocolVersion()); dialog.setLocationRelativeTo(RepositoriesPanel.this); + dialog.setAccessRestriction(gitblit.getDefaultAccessRestriction()); dialog.setUsers(null, gitblit.getUsernames(), null); dialog.setTeams(gitblit.getTeamnames(), null); dialog.setRepositories(gitblit.getRepositories()); dialog.setFederationSets(gitblit.getFederationSets(), 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), @@ -419,10 +425,18 @@ dialog.setTeams(gitblit.getTeamnames(), gitblit.getPermittedTeamnames(repository)); dialog.setRepositories(gitblit.getRepositories()); dialog.setFederationSets(gitblit.getFederationSets(), repository.federationSets); + 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); + 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