Commit de0fce61 authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch 'use-parse-boolean-for-iteration-can-edit-value' into 'master'

Use parseBoolean for canEdit when mounting iteration_select.vue

See merge request gitlab-org/gitlab!53819
parents b07155c0 5c9636d4
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
= f.hidden_field 'milestone_id', value: milestone[:id], id: nil = f.hidden_field 'milestone_id', value: milestone[:id], id: nil
= dropdown_tag('Milestone', options: { title: _('Assign milestone'), toggle_class: 'js-milestone-select js-extra-options', filter: true, dropdown_class: 'dropdown-menu-selectable', placeholder: _('Search milestones'), data: { show_no: true, field_name: "#{issuable_type}[milestone_id]", project_id: issuable_sidebar[:project_id], issuable_id: issuable_sidebar[:id], ability_name: issuable_type, issue_update: issuable_sidebar[:issuable_json_path], use_id: true, default_no: true, selected: milestone[:title], null_default: true, display: 'static' }}) = dropdown_tag('Milestone', options: { title: _('Assign milestone'), toggle_class: 'js-milestone-select js-extra-options', filter: true, dropdown_class: 'dropdown-menu-selectable', placeholder: _('Search milestones'), data: { show_no: true, field_name: "#{issuable_type}[milestone_id]", project_id: issuable_sidebar[:project_id], issuable_id: issuable_sidebar[:id], ability_name: issuable_type, issue_update: issuable_sidebar[:issuable_json_path], use_id: true, default_no: true, selected: milestone[:title], null_default: true, display: 'static' }})
- if @project.group.present? && issuable_sidebar[:supports_iterations] - if @project.group.present? && issuable_sidebar[:supports_iterations]
= render_if_exists 'shared/issuable/iteration_select', can_edit: can_edit_issuable, group_path: @project.group.full_path, project_path: issuable_sidebar[:project_full_path], issue_iid: issuable_sidebar[:iid], issuable_type: issuable_type = render_if_exists 'shared/issuable/iteration_select', can_edit: can_edit_issuable.to_s, group_path: @project.group.full_path, project_path: issuable_sidebar[:project_full_path], issue_iid: issuable_sidebar[:iid], issuable_type: issuable_type
- if issuable_sidebar[:supports_time_tracking] - if issuable_sidebar[:supports_time_tracking]
#issuable-time-tracker.block #issuable-time-tracker.block
......
...@@ -101,7 +101,7 @@ function mountIterationSelect() { ...@@ -101,7 +101,7 @@ function mountIterationSelect() {
createElement('iteration-select', { createElement('iteration-select', {
props: { props: {
groupPath, groupPath,
canEdit, canEdit: parseBoolean(canEdit),
projectPath, projectPath,
issueIid, issueIid,
}, },
......
---
title: Fix invalid prop error for canEdit prop in issue sidebar when user cannot edit iteration
merge_request: 53819
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment