Merge "Don't show exclusive toggle for 'owner' permissions"
diff --git a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
index 92dc887..8e00c06 100644
--- a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
+++ b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
@@ -501,7 +501,7 @@
this.notifyPath('actions.rebaseEdit');
}
} else {
- if (!changeActions.rebasEdit) {
+ if (!changeActions.rebaseEdit) {
this.set('actions.rebaseEdit', REBASE_EDIT);
}
if (changeActions.publishEdit) {
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
index 7e661c7..c2f2f6f 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
@@ -76,7 +76,10 @@
}
gr-change-status {
display: initial;
- margin: .1em .5em .1em 0;
+ margin: .1em .1em .1em .4em;
+ }
+ gr-change-status:first-child {
+ margin-left: 0;
}
.header-title {
align-items: center;
@@ -144,7 +147,9 @@
}
}
.changeStatuses,
- .commitActions {
+ .changeText,
+ .commitActions,
+ .statusText {
align-items: center;
display: flex;
}
@@ -225,6 +230,7 @@
}
gr-commit-info {
display: inline-block;
+ margin-right: -5px;
}
@media screen and (min-width: 80em) {
.commitMessage {
@@ -327,19 +333,22 @@
status="[[status]]"></gr-change-status>
</template>
</div>
+ <div class="statusText">
+ <template
+ is="dom-if"
+ if="[[_computeShowCommitInfo(_changeStatus, _change.current_revision)]]">
+ <span class="text"> as </span>
+ <gr-commit-info
+ change="[[_change]]"
+ commit-info="[[_computeMergedCommitInfo(_change.current_revision, _change.revisions)]]"
+ server-config="[[_serverConfig]]"></gr-commit-info>
+ </template>
+ </div>
+ <span class="separator"></span>
<div class="changeText">
<a aria-label$="[[_computeChangePermalinkAriaLabel(_change._number)]]"
- href$="[[_computeChangeUrl(_change)]]">[[_change._number]]</a><!--
- --><template
- is="dom-if"
- if="[[_computeShowCommitInfo(_changeStatus, _change.current_revision)]]"><!--
- --><span class="text"> ([[_changeStatus]] as </span><!--
- --><gr-commit-info
- change="[[_change]]"
- commit-info="[[_computeMergedCommitInfo(_change.current_revision, _change.revisions)]]"
- server-config="[[_serverConfig]]"></gr-commit-info>)<!--
- --></template><!--
- --><span class="text">: </span><span class="headerSubject">[[_change.subject]]</span>
+ href$="[[_computeChangeUrl(_change)]]">[[_change._number]]</a>
+ <span class="headerSubject">: [[_change.subject]]</span>
</div>
</div><!-- end header-title -->
<div class="commitActions" hidden$="[[!_loggedIn]]">
@@ -370,7 +379,7 @@
server-config="[[_serverConfig]]"
missing-labels="[[_missingLabels]]"
mutable="[[_loggedIn]]"
- parent-is-current="[[!_rebaseOriginallyEnabled]]"
+ parent-is-current="[[_parentIsCurrent]]"
on-show-reply-dialog="_handleShowReplyDialog">
</gr-change-metadata>
<!-- Plugins insert content into following container.
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index fd9a490..b4fb92a 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -224,7 +224,7 @@
value: false,
observer: '_updateToggleContainerClass',
},
- _rebaseOriginallyEnabled: Boolean,
+ _parentIsCurrent: Boolean,
},
behaviors: [
@@ -938,8 +938,10 @@
if (revisionActions && revisionActions.rebase) {
revisionActions.rebase.rebaseOnCurrent =
!!revisionActions.rebase.enabled;
- this._rebaseOriginallyEnabled = !!revisionActions.rebase.enabled;
+ this._parentIsCurrent = !revisionActions.rebase.enabled;
revisionActions.rebase.enabled = true;
+ } else {
+ this._parentIsCurrent = true;
}
return revisionActions;
},
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
index d8367610..7d4a54b 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
@@ -399,6 +399,7 @@
title: 'Rebase onto tip of branch or parent change',
},
};
+ element._parentIsCurrent = undefined;
// Rebase enabled should always end up true.
// When rebase is enabled initially, rebaseOnCurrent should be set to
@@ -408,6 +409,7 @@
assert.isTrue(currentRevisionActions.rebase.enabled);
assert.isTrue(currentRevisionActions.rebase.rebaseOnCurrent);
+ assert.isFalse(element._parentIsCurrent);
delete currentRevisionActions.rebase.enabled;
@@ -418,6 +420,21 @@
assert.isTrue(currentRevisionActions.rebase.enabled);
assert.isFalse(currentRevisionActions.rebase.rebaseOnCurrent);
+ assert.isTrue(element._parentIsCurrent);
+ });
+
+ test('_updateRebaseAction sets _parentIsCurrent on no rebase', () => {
+ const currentRevisionActions = {
+ cherrypick: {
+ enabled: true,
+ label: 'Cherry Pick',
+ method: 'POST',
+ title: 'cherrypick',
+ },
+ };
+ element._parentIsCurrent = undefined;
+ element._updateRebaseAction(currentRevisionActions);
+ assert.isTrue(element._parentIsCurrent);
});
test('_reload is called when an approved label is removed', () => {
diff --git a/polygerrit-ui/app/elements/change/gr-commit-info/gr-commit-info.html b/polygerrit-ui/app/elements/change/gr-commit-info/gr-commit-info.html
index 67b54d6..3eaeab25 100644
--- a/polygerrit-ui/app/elements/change/gr-commit-info/gr-commit-info.html
+++ b/polygerrit-ui/app/elements/change/gr-commit-info/gr-commit-info.html
@@ -25,9 +25,6 @@
align-items: center;
display: flex;
}
- gr-copy-clipboard {
- padding-left: .5em;
- }
</style>
<div class="container">
<template is="dom-if" if="[[_showWebLink]]">
diff --git a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html
index c92919d..4c6b95a 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html
+++ b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html
@@ -135,6 +135,9 @@
font-family: var(--font-family-bold);
margin-right: 24px;
}
+ gr-commit-info {
+ margin-right: -5px;
+ }
@media screen and (max-width: 50em) {
.patchInfo-header .desktop {
display: none;
diff --git a/polygerrit-ui/app/elements/gr-app.html b/polygerrit-ui/app/elements/gr-app.html
index ef93794..ced27dd 100644
--- a/polygerrit-ui/app/elements/gr-app.html
+++ b/polygerrit-ui/app/elements/gr-app.html
@@ -55,6 +55,7 @@
<link rel="import" href="./settings/gr-registration-dialog/gr-registration-dialog.html">
<link rel="import" href="./settings/gr-settings-view/gr-settings-view.html">
<link rel="import" href="./shared/gr-fixed-panel/gr-fixed-panel.html">
+<link rel="import" href="./shared/gr-rest-api-interface/gr-rest-api-interface.html">
<script src="../scripts/util.js"></script>