diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2014-12-04 15:20:52 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2014-12-05 01:46:30 +0000 |
| commit | 074fd761bfe1d4c3e66ce2bdacf8b442e9ea7c70 (patch) | |
| tree | b3287d944de619ec7cb9f2a429f40bb261afdbcf | |
| parent | b3d138349e099750dc32957899a9fa2835b95523 (diff) | |
Don't show 'Add Me' button for change owner or existing reviewers
Change-Id: Ib79bd18d863b7b62e90be7179d85465f25cc7759
| -rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java | 10 | ||||
| -rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.ui.xml | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java index 10a140dc17..87320b85e7 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java @@ -65,6 +65,7 @@ public class Reviewers extends Composite { @UiField Element reviewersText; @UiField Button openForm; + @UiField Button addMe; @UiField Element form; @UiField Element error; @UiField(provided = true) @@ -146,7 +147,7 @@ public class Reviewers extends Composite { } } - @UiHandler("addme") + @UiHandler("addMe") void onAddMe(ClickEvent e) { String accountId = String.valueOf(Gerrit.getUserAccountInfo()._account_id()); addReviewer(accountId, false); @@ -248,6 +249,13 @@ public class Reviewers extends Composite { reviewersText.setInnerSafeHtml(rHtml); ccText.setInnerSafeHtml(ccHtml); + if (Gerrit.isSignedIn()) { + int currentUser = Gerrit.getUserAccountInfo()._account_id(); + boolean showAddMeButton = info.owner()._account_id() != currentUser + && !cc.containsKey(currentUser) + && !r.containsKey(currentUser); + addMe.setVisible(showAddMeButton); + } } private static Map<Integer, VotableInfo> votable(ChangeInfo change) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.ui.xml index 4e3b0c6e2a..024197d48d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.ui.xml @@ -72,7 +72,8 @@ limitations under the License. <g:Button ui:field='add' styleName='{res.style.button}'> <div>Add</div> </g:Button> - <g:Button ui:field='addme' styleName='{res.style.button}'> + <g:Button ui:field='addMe' + styleName='{res.style.button}' visible='false'> <div>Add Me</div> </g:Button> <g:Button ui:field='cancel' |