diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-29 18:09:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-29 18:09:58 +0300 |
| commit | b6c37979bc2f585f8b3ecd523e50a8caebf10c2f (patch) | |
| tree | ababf3206f1b604ba99b4c5e0ba18efd1a028736 /app/assets/javascripts/sidebar | |
| parent | c6c658b674a37d73ba2f7d8e5808fe4d67d09919 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
3 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/sidebar/components/assignees/issuable_assignees.vue b/app/assets/javascripts/sidebar/components/assignees/issuable_assignees.vue index a94dd128a1a..4408ebb881b 100644 --- a/app/assets/javascripts/sidebar/components/assignees/issuable_assignees.vue +++ b/app/assets/javascripts/sidebar/components/assignees/issuable_assignees.vue @@ -23,6 +23,10 @@ export default { required: false, default: false, }, + editable: { + type: Boolean, + required: true, + }, }, computed: { assigneesText() { @@ -43,7 +47,7 @@ export default { data-testid="none" > <span> {{ __('None') }}</span> - <template v-if="signedIn"> + <template v-if="signedIn && editable"> <span class="gl-ml-2">-</span> <gl-button data-testid="assign-yourself" diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue index 5c432ca0e03..26fda2a823c 100644 --- a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue +++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue @@ -72,6 +72,10 @@ export default { type: Boolean, required: true, }, + editable: { + type: Boolean, + required: true, + }, }, data() { return { @@ -252,6 +256,7 @@ export default { :users="assignees" :issuable-type="issuableType" :signed-in="signedIn" + :editable="editable" @assign-self="assignSelf" @expand-widget="expandWidget" /> diff --git a/app/assets/javascripts/sidebar/mount_sidebar.js b/app/assets/javascripts/sidebar/mount_sidebar.js index 62032359d95..1cb3c30b9e0 100644 --- a/app/assets/javascripts/sidebar/mount_sidebar.js +++ b/app/assets/javascripts/sidebar/mount_sidebar.js @@ -162,6 +162,7 @@ function mountAssigneesComponent() { issuableType, issuableId: id, allowMultipleAssignees: !el.dataset.maxAssignees, + editable, }, scopedSlots: { collapsed: ({ users }) => |