Merge "ChangeScreen: Highlight selected outdated patch set"
This commit is contained in:
commit
eeec605ecc
Binary file not shown.
After Width: | Height: | Size: 26 KiB |
@ -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"]
|
||||
|
||||
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]]
|
||||
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
|
||||
|
@ -126,6 +126,7 @@ public class ChangeScreen extends Screen {
|
||||
String pushCertStatus();
|
||||
String replyBox();
|
||||
String selected();
|
||||
String notCurrentPatchSet();
|
||||
}
|
||||
|
||||
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,
|
||||
NativeMap<ActionInfo> actions) {
|
||||
int currentPatchSet;
|
||||
@ -433,16 +442,22 @@ public class ChangeScreen extends Screen {
|
||||
}
|
||||
|
||||
String currentlyViewedPatchSet;
|
||||
if (info.revision(revision).id().equals("edit")) {
|
||||
boolean isPatchSetCurrent = true;
|
||||
String revisionId = info.revision(revision).id();
|
||||
if (revisionId.equals("edit")) {
|
||||
currentlyViewedPatchSet =
|
||||
Resources.M.editPatchSet(RevisionInfo.findEditParent(info.revisions()
|
||||
.values()));
|
||||
currentPatchSet = info.revisions().values().length() - 1;
|
||||
} else {
|
||||
currentlyViewedPatchSet = info.revision(revision).id();
|
||||
currentlyViewedPatchSet = revisionId;
|
||||
if (!currentlyViewedPatchSet.equals(Integer.toString(currentPatchSet))) {
|
||||
isPatchSetCurrent = false;
|
||||
}
|
||||
}
|
||||
patchSetsText.setInnerText(Resources.M.patchSets(
|
||||
currentlyViewedPatchSet, currentPatchSet));
|
||||
updatePatchSetsTextStyle(isPatchSetCurrent);
|
||||
patchSetsAction = new PatchSetsAction(
|
||||
info.legacyId(), revision, edit,
|
||||
style, headerLine, patchSets);
|
||||
|
@ -350,6 +350,10 @@ limitations under the License.
|
||||
.pushCertStatus {
|
||||
padding-left: 5px;
|
||||
}
|
||||
|
||||
.notCurrentPatchSet {
|
||||
background-color: #FFA62F;
|
||||
}
|
||||
</ui:style>
|
||||
|
||||
<g:HTMLPanel styleName='{style.cs2}'>
|
||||
|
Loading…
Reference in New Issue
Block a user