Fixed collision error on rename repository or user

1 files changed, 2 insertions, 0 deletions

diff --git a/src/com/gitblit/client/GitblitPanel.java b/src/com/gitblit/client/GitblitPanel.java
index e4c6e76c..5737c15c 100644
--- a/src/com/gitblit/client/GitblitPanel.java
+++ b/src/com/gitblit/client/GitblitPanel.java
@@ -656,6 +656,7 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 		List<String> usernames = gitblit.getUsernames();

 		List<String> members = gitblit.getPermittedUsernames(repository);

 		dialog.setUsers(repository.owner, usernames, members);

+		dialog.setRepositories(gitblit.getRepositories());

 		dialog.setFederationSets(gitblit.getFederationSets(), repository.federationSets);

 		dialog.setVisible(true);

 		final RepositoryModel revisedRepository = dialog.getRepository();

@@ -798,6 +799,7 @@ public class GitblitPanel extends JPanel implements CloseTabListener {
 	protected void editUser(final UserModel user) {

 		EditUserDialog dialog = new EditUserDialog(user, gitblit.getSettings());

 		dialog.setLocationRelativeTo(GitblitPanel.this);

+		dialog.setUsers(gitblit.getUsers());

 		dialog.setRepositories(gitblit.getRepositories(), new ArrayList<String>(user.repositories));

 		dialog.setVisible(true);

 		final UserModel revisedUser = dialog.getUser();