Merge "ChangeScreen: Highlight selected outdated patch set"

This commit is contained in:
David Pursehouse 2016-02-08 04:31:49 +00:00 committed by Gerrit Code Review
commit eeec605ecc
4 changed files with 25 additions and 2 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -391,6 +391,10 @@ operations are only available on the current patch set.
image::images/user-review-ui-change-screen-patch-sets.png[width=800, link="images/user-review-ui-change-screen-patch-sets.png"] image::images/user-review-ui-change-screen-patch-sets.png[width=800, link="images/user-review-ui-change-screen-patch-sets.png"]
Another indication is a highlighted drop-down label.
image::images/user-review-ui-change-screen-not-current.png[width=800, link="images/user-review-ui-change-screen-not-current.png"]
[[patch-set-drop-down]] [[patch-set-drop-down]]
The patch set drop-down list shows the list of patch sets and allows to The patch set drop-down list shows the list of patch sets and allows to
switch between them. The patch sets are sorted in descending order so switch between them. The patch sets are sorted in descending order so

View File

@ -126,6 +126,7 @@ public class ChangeScreen extends Screen {
String pushCertStatus(); String pushCertStatus();
String replyBox(); String replyBox();
String selected(); String selected();
String notCurrentPatchSet();
} }
static ChangeScreen get(NativeEvent in) { static ChangeScreen get(NativeEvent in) {
@ -420,6 +421,14 @@ public class ChangeScreen extends Screen {
} }
} }
private void updatePatchSetsTextStyle(boolean isPatchSetCurrent) {
if (isPatchSetCurrent) {
patchSetsText.removeClassName(style.notCurrentPatchSet());
} else {
patchSetsText.addClassName(style.notCurrentPatchSet());
}
}
private void initRevisionsAction(ChangeInfo info, String revision, private void initRevisionsAction(ChangeInfo info, String revision,
NativeMap<ActionInfo> actions) { NativeMap<ActionInfo> actions) {
int currentPatchSet; int currentPatchSet;
@ -433,16 +442,22 @@ public class ChangeScreen extends Screen {
} }
String currentlyViewedPatchSet; String currentlyViewedPatchSet;
if (info.revision(revision).id().equals("edit")) { boolean isPatchSetCurrent = true;
String revisionId = info.revision(revision).id();
if (revisionId.equals("edit")) {
currentlyViewedPatchSet = currentlyViewedPatchSet =
Resources.M.editPatchSet(RevisionInfo.findEditParent(info.revisions() Resources.M.editPatchSet(RevisionInfo.findEditParent(info.revisions()
.values())); .values()));
currentPatchSet = info.revisions().values().length() - 1; currentPatchSet = info.revisions().values().length() - 1;
} else { } else {
currentlyViewedPatchSet = info.revision(revision).id(); currentlyViewedPatchSet = revisionId;
if (!currentlyViewedPatchSet.equals(Integer.toString(currentPatchSet))) {
isPatchSetCurrent = false;
}
} }
patchSetsText.setInnerText(Resources.M.patchSets( patchSetsText.setInnerText(Resources.M.patchSets(
currentlyViewedPatchSet, currentPatchSet)); currentlyViewedPatchSet, currentPatchSet));
updatePatchSetsTextStyle(isPatchSetCurrent);
patchSetsAction = new PatchSetsAction( patchSetsAction = new PatchSetsAction(
info.legacyId(), revision, edit, info.legacyId(), revision, edit,
style, headerLine, patchSets); style, headerLine, patchSets);

View File

@ -350,6 +350,10 @@ limitations under the License.
.pushCertStatus { .pushCertStatus {
padding-left: 5px; padding-left: 5px;
} }
.notCurrentPatchSet {
background-color: #FFA62F;
}
</ui:style> </ui:style>
<g:HTMLPanel styleName='{style.cs2}'> <g:HTMLPanel styleName='{style.cs2}'>