Merge changes Icc1470e5,I537733c0
* changes:
Stop using page.js directly from random components
Extract route handling into view model
diff --git a/java/com/google/gerrit/server/account/AccountResolver.java b/java/com/google/gerrit/server/account/AccountResolver.java
index fcfc805..d2417d7 100644
--- a/java/com/google/gerrit/server/account/AccountResolver.java
+++ b/java/com/google/gerrit/server/account/AccountResolver.java
@@ -790,7 +790,7 @@
@Override
public Predicate<AccountState> get() {
- return accountControlFactory.get(asUser.asIdentifiedUser())::canSee;
+ return accountControlFactory.get(asUser)::canSee;
}
}
diff --git a/javatests/com/google/gerrit/acceptance/api/change/SubmitRequirementIT.java b/javatests/com/google/gerrit/acceptance/api/change/SubmitRequirementIT.java
index 242c278..ab2f358 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/SubmitRequirementIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/SubmitRequirementIT.java
@@ -33,6 +33,7 @@
import com.google.gerrit.acceptance.ExtensionRegistry.Registration;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit;
+import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.acceptance.UseTimezone;
import com.google.gerrit.acceptance.VerifyNoPiiInChangeNotes;
import com.google.gerrit.acceptance.testsuite.change.IndexOperations;
@@ -424,6 +425,26 @@
}
@Test
+ public void checkSubmitRequirement_verifiesUploader() throws Exception {
+ PushOneCommit.Result r = createChange();
+ String changeId = r.getChangeId();
+ voteLabel(changeId, "Code-Review", 2);
+ TestAccount anotherUser = accountCreator.createValid("anotherUser");
+
+ SubmitRequirementInput in =
+ createSubmitRequirementInput(
+ "Foo", /* submittabilityExpression= */ "uploader:" + anotherUser.id());
+ SubmitRequirementResultInfo result = gApi.changes().id(changeId).checkSubmitRequirement(in);
+ assertThat(result.status).isEqualTo(SubmitRequirementResultInfo.Status.UNSATISFIED);
+
+ in =
+ createSubmitRequirementInput(
+ "Foo", /* submittabilityExpression= */ "uploader:" + r.getChange().change().getOwner());
+ result = gApi.changes().id(changeId).checkSubmitRequirement(in);
+ assertThat(result.status).isEqualTo(SubmitRequirementResultInfo.Status.SATISFIED);
+ }
+
+ @Test
public void submitRequirement_withLabelEqualsMax() throws Exception {
configSubmitRequirement(
project,
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.ts b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.ts
index b0dbda5..6f8bd9a 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.ts
+++ b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.ts
@@ -71,6 +71,9 @@
text = '';
@state()
+ shouldRebaseChain = false;
+
+ @state()
private query: AutocompleteQuery;
@state()
@@ -184,7 +187,7 @@
/>
<label id="rebaseOnTipLabel" for="rebaseOnTipInput">
Rebase on top of the ${this.branch} branch<span
- ?hidden=${!this.hasParent}
+ ?hidden=${!this.hasParent || this.shouldRebaseChain}
>
(breaks relation chain)
</span>
@@ -206,7 +209,9 @@
/>
<label id="rebaseOnOtherLabel" for="rebaseOnOtherInput">
Rebase on a specific change, ref, or commit
- <span ?hidden=${!this.hasParent}> (breaks relation chain) </span>
+ <span ?hidden=${!this.hasParent || this.shouldRebaseChain}>
+ (breaks relation chain)
+ </span>
</label>
</div>
<div class="parentRevisionContainer">
@@ -230,10 +235,17 @@
>
</div>
${when(
- this.flagsService.isEnabled(KnownExperimentId.REBASE_CHAIN),
+ this.flagsService.isEnabled(KnownExperimentId.REBASE_CHAIN) &&
+ this.hasParent,
() =>
html`<div>
- <input id="rebaseChain" type="checkbox" />
+ <input
+ id="rebaseChain"
+ type="checkbox"
+ @change=${() => {
+ this.shouldRebaseChain = !!this.rebaseChain?.checked;
+ }}
+ />
<label for="rebaseChain">Rebase all ancestors</label>
</div>`
)}