From fb9813874c811ae06604c30d875e9dce57df9874 Mon Sep 17 00:00:00 2001 From: SHaselbauer <sarah.haselbauer@akquinet.de> Date: Mon, 21 Jan 2013 16:28:11 -0500 Subject: [PATCH] Merge multiple owners feature (pull request #63, #66) --- src/com/gitblit/client/EditRepositoryDialog.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java index 6f9ed52..5c03ff8 100644 --- a/src/com/gitblit/client/EditRepositoryDialog.java +++ b/src/com/gitblit/client/EditRepositoryDialog.java @@ -335,7 +335,7 @@ 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 @@ 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(); -- Gitblit v1.9.1