Merge branch 'bvl-fix-close-issuable-link' into 'master'
Use relative paths for opening and closing issuables Closes #35822 See merge request gitlab-org/gitlab-ce!14555
This commit is contained in:
commit
0ab2ff72a4
|
@ -248,16 +248,25 @@ module IssuablesHelper
|
|||
Gitlab::IssuablesCountForState.new(finder)[state]
|
||||
end
|
||||
|
||||
def close_issuable_url(issuable)
|
||||
issuable_url(issuable, close_reopen_params(issuable, :close))
|
||||
def close_issuable_path(issuable)
|
||||
issuable_path(issuable, close_reopen_params(issuable, :close))
|
||||
end
|
||||
|
||||
def reopen_issuable_url(issuable)
|
||||
issuable_url(issuable, close_reopen_params(issuable, :reopen))
|
||||
def reopen_issuable_path(issuable)
|
||||
issuable_path(issuable, close_reopen_params(issuable, :reopen))
|
||||
end
|
||||
|
||||
def close_reopen_issuable_url(issuable, should_inverse = false)
|
||||
issuable.closed? ^ should_inverse ? reopen_issuable_url(issuable) : close_issuable_url(issuable)
|
||||
def close_reopen_issuable_path(issuable, should_inverse = false)
|
||||
issuable.closed? ^ should_inverse ? reopen_issuable_path(issuable) : close_issuable_path(issuable)
|
||||
end
|
||||
|
||||
def issuable_path(issuable, *options)
|
||||
case issuable
|
||||
when Issue
|
||||
issue_path(issuable, *options)
|
||||
when MergeRequest
|
||||
merge_request_path(issuable, *options)
|
||||
end
|
||||
end
|
||||
|
||||
def issuable_url(issuable, *options)
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
- button_method = issuable_close_reopen_button_method(issuable)
|
||||
|
||||
- if can_update && is_current_user
|
||||
= link_to "Close #{display_issuable_type}", close_issuable_url(issuable), method: button_method,
|
||||
= link_to "Close #{display_issuable_type}", close_issuable_path(issuable), method: button_method,
|
||||
class: "hidden-xs hidden-sm btn btn-grouped btn-close js-btn-issue-action #{issuable_button_visibility(issuable, true)}", title: "Close #{display_issuable_type}"
|
||||
= link_to "Reopen #{display_issuable_type}", reopen_issuable_url(issuable), method: button_method,
|
||||
= link_to "Reopen #{display_issuable_type}", reopen_issuable_path(issuable), method: button_method,
|
||||
class: "hidden-xs hidden-sm btn btn-grouped btn-reopen js-btn-issue-action #{issuable_button_visibility(issuable, false)}", title: "Reopen #{display_issuable_type}"
|
||||
- elsif can_update && !is_current_user
|
||||
= render 'shared/issuable/close_reopen_report_toggle', issuable: issuable
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
- button_method = issuable_close_reopen_button_method(issuable)
|
||||
|
||||
.pull-left.btn-group.prepend-left-10.issuable-close-dropdown.droplab-dropdown.js-issuable-close-dropdown
|
||||
= link_to "#{display_button_action} #{display_issuable_type}", close_reopen_issuable_url(issuable),
|
||||
= link_to "#{display_button_action} #{display_issuable_type}", close_reopen_issuable_path(issuable),
|
||||
method: button_method, class: "#{button_class} btn-#{button_action}", title: "#{display_button_action} #{display_issuable_type}"
|
||||
|
||||
= button_tag type: 'button', class: "#{toggle_class} btn-#{button_action}-color",
|
||||
|
@ -16,7 +16,7 @@
|
|||
|
||||
%ul#issuable-close-menu.js-issuable-close-menu.dropdown-menu{ class: button_responsive_class, data: { dropdown: true } }
|
||||
%li.close-item{ class: "#{issuable_button_visibility(issuable, true) || 'droplab-item-selected'}",
|
||||
data: { text: "Close #{display_issuable_type}", url: close_issuable_url(issuable),
|
||||
data: { text: "Close #{display_issuable_type}", url: close_issuable_path(issuable),
|
||||
button_class: "#{button_class} btn-close", toggle_class: "#{toggle_class} btn-close-color", method: button_method } }
|
||||
%button.btn.btn-transparent
|
||||
= icon('check', class: 'icon')
|
||||
|
@ -26,7 +26,7 @@
|
|||
= display_issuable_type
|
||||
|
||||
%li.reopen-item{ class: "#{issuable_button_visibility(issuable, false) || 'droplab-item-selected'}",
|
||||
data: { text: "Reopen #{display_issuable_type}", url: reopen_issuable_url(issuable),
|
||||
data: { text: "Reopen #{display_issuable_type}", url: reopen_issuable_path(issuable),
|
||||
button_class: "#{button_class} btn-reopen", toggle_class: "#{toggle_class} btn-reopen-color", method: button_method } }
|
||||
%button.btn.btn-transparent
|
||||
= icon('check', class: 'icon')
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix CSRF validation issue when closing/opening merge requests from the UI
|
||||
merge_request: 14555
|
||||
author:
|
||||
type: fixed
|
Loading…
Reference in New Issue