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

This commit is contained in:
Shawn Pearce
2013-11-25 18:08:08 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 1 deletions

View File

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

View File

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