opendev/gerrit
Code Issues Proposed changes

Merge "ChangeScreen2: Hide strategy row if no strategy is displayed"

Browse Source
This commit is contained in:
Shawn Pearce
2013-11-25 18:08:08 +00:00
committed by Gerrit Code Review
parent 77c5aed3bd aedb0bb6c7
commit 429512878d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java
View File

@@ -143,6 +143,7 @@ public class ChangeScreen2 extends Screen {
@UiField Image projectQuery; @UiField Image projectQuery;
@UiField InlineHyperlink projectLink; @UiField InlineHyperlink projectLink;
@UiField InlineHyperlink branchLink; @UiField InlineHyperlink branchLink;
@UiField Element strategy;
@UiField Element submitActionText; @UiField Element submitActionText;
@UiField Element notMergeable; @UiField Element notMergeable;
@UiField Topic topic; @UiField Topic topic;
@@ -796,6 +797,8 @@ public class ChangeScreen2 extends Screen {
if (current) { if (current) {
loadSubmitType(info.status(), canSubmit); loadSubmitType(info.status(), canSubmit);
} else {
setVisible(strategy, false);
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml
View File

@@ -419,7 +419,7 @@ limitations under the License.
<th><ui:msg>Topic</ui:msg></th> <th><ui:msg>Topic</ui:msg></th>
<td><c:Topic ui:field='topic'/></td> <td><c:Topic ui:field='topic'/></td>
</tr> </tr>
<tr> <tr ui:field='strategy'>
<th><ui:msg>Strategy</ui:msg></th> <th><ui:msg>Strategy</ui:msg></th>
<td> <td>
<span ui:field='submitActionText'/> <span ui:field='submitActionText'/>