diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-03 18:25:37 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-07 14:57:28 +0100 |
| commit | c53f2d8ebc64ef59f67265ae7c6b96a3c127cea7 (patch) | |
| tree | 3a9291d8c45dcff64e5e6efc648071e17433ba50 /app/views/shared | |
| parent | 55dd0d722d87a24f3b83a8a7692666a64387d668 (diff) | |
| download | gitlab-ce-c53f2d8ebc64ef59f67265ae7c6b96a3c127cea7.tar.gz | |
Revert parent param removal
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/issuable/_close_reopen_button.html.haml | 6 | ||||
| -rw-r--r-- | app/views/shared/issuable/_close_reopen_report_toggle.html.haml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/shared/issuable/_close_reopen_button.html.haml b/app/views/shared/issuable/_close_reopen_button.html.haml index 4d8721ab54a..fc8729d10d4 100644 --- a/app/views/shared/issuable/_close_reopen_button.html.haml +++ b/app/views/shared/issuable/_close_reopen_button.html.haml @@ -1,10 +1,10 @@ - is_current_user = current_user == issuable.author - display_issuable_type = issuable.model_name.human.downcase -- button_method = issuable.is_a?(MergeRequest) ? 'put' : '' +- button_method = issuable.is_a?(MergeRequest) ? :put : nil - if can_update && is_current_user - = link_to "Close #{display_issuable_type}", close_issuable_url(issuable), { method: button_method, class: "hidden-xs hidden-sm btn btn-close btn-grouped #{'hidden' if issuable.closed?}", title: "Close #{display_issuable_type}" } - = link_to "Reopen #{display_issuable_type}", reopen_issuable_url(issuable), { method: button_method, class: "hidden-xs hidden-sm btn btn-reopen btn-grouped #{'hidden' unless issuable.closed?}", title: "Reopen #{display_issuable_type}" } + = link_to "Close #{display_issuable_type}", close_issuable_url(issuable), method: button_method, class: "hidden-xs hidden-sm btn btn-close btn-grouped #{'hidden' if issuable.closed?}", title: "Close #{display_issuable_type}" + = link_to "Reopen #{display_issuable_type}", reopen_issuable_url(issuable), method: button_method, class: "hidden-xs hidden-sm btn btn-reopen btn-grouped #{'hidden' unless issuable.closed?}", title: "Reopen #{display_issuable_type}" - elsif can_update && !is_current_user = render 'shared/issuable/close_reopen_report_toggle', issuable: issuable - else diff --git a/app/views/shared/issuable/_close_reopen_report_toggle.html.haml b/app/views/shared/issuable/_close_reopen_report_toggle.html.haml index 8a68fd83d92..5a616c377f2 100644 --- a/app/views/shared/issuable/_close_reopen_report_toggle.html.haml +++ b/app/views/shared/issuable/_close_reopen_report_toggle.html.haml @@ -4,10 +4,10 @@ - button_responsive_class = 'hidden-xs hidden-sm' - button_class = "#{button_responsive_class} btn btn-grouped js-issuable-close-button issuable-close-button" - toggle_class = "#{button_responsive_class} btn btn-nr dropdown-toggle js-issuable-close-toggle" -- button_method = issuable.is_a?(MergeRequest) ? 'put' : '' +- button_method = issuable.is_a?(MergeRequest) ? :put : nil .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), { method: button_method, class: "#{button_class} btn-#{button_action}", title: "#{display_button_action} #{display_issuable_type}" } + = link_to "#{display_button_action} #{display_issuable_type}", close_reopen_issuable_url(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", data: { 'dropdown-trigger' => '#issuable-close-menu' }, 'aria-label' => 'Toggle dropdown' do = icon('caret-down', class: 'toggle-icon icon') |