diff options
| author | SHaselbauer <sarah.haselbauer@akquinet.de> | 2013-01-21 16:28:11 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-01-21 16:28:11 -0500 |
| commit | fb9813874c811ae06604c30d875e9dce57df9874 (patch) | |
| tree | 457e22ea6df7f34501bb14a0e94fc5644ab8dbe2 /src/com/gitblit/client/RepositoriesPanel.java | |
| parent | 1f82620a088efa2ba3254df1805e229266690673 (diff) | |
| download | gitblit-fb9813874c811ae06604c30d875e9dce57df9874.tar.gz gitblit-fb9813874c811ae06604c30d875e9dce57df9874.zip | |
Merge multiple owners feature (pull request #63, #66)
Diffstat (limited to 'src/com/gitblit/client/RepositoriesPanel.java')
| -rw-r--r-- | src/com/gitblit/client/RepositoriesPanel.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/gitblit/client/RepositoriesPanel.java b/src/com/gitblit/client/RepositoriesPanel.java index 769d33b8..6700b21a 100644 --- a/src/com/gitblit/client/RepositoriesPanel.java +++ b/src/com/gitblit/client/RepositoriesPanel.java @@ -52,6 +52,7 @@ import com.gitblit.Keys; import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.FeedModel;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.utils.MultiConfigUtil;
import com.gitblit.utils.StringUtils;
/**
@@ -84,6 +85,8 @@ public abstract class RepositoriesPanel extends JPanel { private JTextField filterTextfield;
private JButton clearCache;
+
+ private MultiConfigUtil multiConfigUtil = new MultiConfigUtil();
public RepositoriesPanel(GitblitClient gitblit) {
super();
@@ -453,7 +456,7 @@ public abstract class RepositoriesPanel extends JPanel { dialog.setLocationRelativeTo(RepositoriesPanel.this);
List<String> usernames = gitblit.getUsernames();
List<RegistrantAccessPermission> members = gitblit.getUserAccessPermissions(repository);
- dialog.setUsers(repository.owner, usernames, members);
+ dialog.setUsers(multiConfigUtil.convertCollectionToSingleLineString(repository.getRepoAdministrators()), usernames, members);
dialog.setTeams(gitblit.getTeamnames(), gitblit.getTeamAccessPermissions(repository));
dialog.setRepositories(gitblit.getRepositories());
dialog.setFederationSets(gitblit.getFederationSets(), repository.federationSets);
|