diff options
Diffstat (limited to 'src/com/gitblit/client')
| -rw-r--r-- | src/com/gitblit/client/EditRepositoryDialog.java | 6 | ||||
| -rw-r--r-- | src/com/gitblit/client/EditUserDialog.java | 4 | ||||
| -rw-r--r-- | src/com/gitblit/client/GitblitClient.java | 4 | ||||
| -rw-r--r-- | src/com/gitblit/client/RegistrantPermissionsPanel.java | 4 | ||||
| -rw-r--r-- | src/com/gitblit/client/RepositoriesPanel.java | 5 | ||||
| -rw-r--r-- | src/com/gitblit/client/RepositoriesTableModel.java | 4 |
6 files changed, 15 insertions, 12 deletions
diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java index 6f9ed525..5c03ff82 100644 --- a/src/com/gitblit/client/EditRepositoryDialog.java +++ b/src/com/gitblit/client/EditRepositoryDialog.java @@ -335,7 +335,7 @@ public class EditRepositoryDialog extends JDialog { usersPalette = new RegistrantPermissionsPanel(RegistrantType.USER);
JPanel northFieldsPanel = new JPanel(new GridLayout(0, 1, 0, 5));
- northFieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), ownerField));
+ northFieldsPanel.add(newFieldPanel(Translation.get("gb.repoAdministrators"), ownerField));
northFieldsPanel.add(newFieldPanel(Translation.get("gb.accessRestriction"),
accessRestriction), BorderLayout.NORTH);
@@ -556,8 +556,8 @@ public class EditRepositoryDialog extends JDialog { repository.name = rname;
repository.description = descriptionField.getText();
- repository.owner = ownerField.getSelectedItem() == null ? null
- : ownerField.getSelectedItem().toString();
+ repository.addRepoAdministrator(ownerField.getSelectedItem() == null ? null
+ : ownerField.getSelectedItem().toString());
repository.HEAD = headRefField.getSelectedItem() == null ? null
: headRefField.getSelectedItem().toString();
repository.gcPeriod = (Integer) gcPeriod.getSelectedItem();
diff --git a/src/com/gitblit/client/EditUserDialog.java b/src/com/gitblit/client/EditUserDialog.java index 0400f5c9..cb04b315 100644 --- a/src/com/gitblit/client/EditUserDialog.java +++ b/src/com/gitblit/client/EditUserDialog.java @@ -389,7 +389,7 @@ public class EditUserDialog extends JDialog { List<String> restricted = new ArrayList<String>();
for (RepositoryModel repo : repositories) {
// exclude Owner or personal repositories
- if (!repo.isOwner(username) && !repo.isUsersPersonalRepository(username)) {
+ if (!repo.isRepoAdministrator(username) && !repo.isUsersPersonalRepository(username)) {
if (repo.accessRestriction.exceeds(AccessRestrictionType.NONE)
&& repo.authorizationControl.equals(AuthorizationControl.NAMED)) {
restricted.add(repo.name);
@@ -438,7 +438,7 @@ public class EditUserDialog extends JDialog { permission.mutable = false;
continue;
}
- boolean isOwner = rm.isOwner(username);
+ boolean isOwner = rm.isRepoAdministrator(username);
if (isOwner) {
permission.permissionType = PermissionType.OWNER;
permission.mutable = false;
diff --git a/src/com/gitblit/client/GitblitClient.java b/src/com/gitblit/client/GitblitClient.java index 1101cd60..01db46e5 100644 --- a/src/com/gitblit/client/GitblitClient.java +++ b/src/com/gitblit/client/GitblitClient.java @@ -162,7 +162,7 @@ public class GitblitClient implements Serializable { }
public boolean isOwner(RepositoryModel model) {
- return account != null && account.equalsIgnoreCase(model.owner);
+ return model.isRepoAdministrator(account);
}
public String getURL(String action, String repository, String objectId) {
@@ -532,7 +532,7 @@ public class GitblitClient implements Serializable { // TODO reconsider ownership as a user property
// manually specify personal repository ownerships
for (RepositoryModel rm : allRepositories) {
- if (rm.isUsersPersonalRepository(user.username) || rm.isOwner(user.username)) {
+ if (rm.isUsersPersonalRepository(user.username) || rm.isRepoAdministrator(user.username)) {
RegistrantAccessPermission rp = new RegistrantAccessPermission(rm.name, AccessPermission.REWIND,
PermissionType.OWNER, RegistrantType.REPOSITORY, null, false);
// user may be owner of a repository to which they've inherited
diff --git a/src/com/gitblit/client/RegistrantPermissionsPanel.java b/src/com/gitblit/client/RegistrantPermissionsPanel.java index 98dbfb72..46ba689c 100644 --- a/src/com/gitblit/client/RegistrantPermissionsPanel.java +++ b/src/com/gitblit/client/RegistrantPermissionsPanel.java @@ -209,8 +209,8 @@ public class RegistrantPermissionsPanel extends JPanel { setToolTipText(Translation.get("gb.administratorPermission"));
break;
case OWNER:
- setText(Translation.get("gb.owner"));
- setToolTipText(Translation.get("gb.ownerPermission"));
+ setText(Translation.get("gb.repoAdministrators"));
+ setToolTipText(Translation.get("gb.repoAdministratorPermission"));
break;
case TEAM:
setText(ap.source == null ? Translation.get("gb.team") : ap.source);
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);
diff --git a/src/com/gitblit/client/RepositoriesTableModel.java b/src/com/gitblit/client/RepositoriesTableModel.java index c3eaf6e5..65f49ca0 100644 --- a/src/com/gitblit/client/RepositoriesTableModel.java +++ b/src/com/gitblit/client/RepositoriesTableModel.java @@ -73,7 +73,7 @@ public class RepositoriesTableModel extends AbstractTableModel { case Description:
return Translation.get("gb.description");
case Owner:
- return Translation.get("gb.owner");
+ return Translation.get("gb.repoAdministrators");
case Last_Change:
return Translation.get("gb.lastChange");
case Size:
@@ -111,7 +111,7 @@ public class RepositoriesTableModel extends AbstractTableModel { case Description:
return model.description;
case Owner:
- return model.owner;
+ return model.getRepoAdministrators();
case Indicators:
return model;
case Last_Change:
|