Skip to content
Snippets Groups Projects
Commit e213c223 authored by Phil Hughes's avatar Phil Hughes
Browse files

Updated how the merge request buttons are hidden

Added a suffix to JS variables
parent 6118023a
No related branches found
No related tags found
No related merge requests found
issuable_created = false
@Issuable =
open: 'opened'
reopen: 'reopened'
closed: 'closed'
merged: 'merged'
open_status: 'opened'
reopen_status: 'reopened'
closed_status: 'closed'
merged_status: 'merged'
 
init: ->
unless issuable_created
Loading
Loading
@@ -18,11 +18,11 @@ issuable_created = false
$(document)
.off 'issuable:status'
.on 'issuable:status', (e, status) ->
if status is Issuable.open or status is Issuable.reopen
if status is Issuable.open_status or status is Issuable.reopen_status
Issuable.showOpenButtons()
else if status is Issuable.closed
else if status is Issuable.closed_status
Issuable.showClosedButtons()
else if status is Issuable.merged
else if status is Issuable.merged_status
Issuable.showClosedButtons()
Issuable.showMergedStatus()
 
Loading
Loading
Loading
Loading
@@ -96,13 +96,4 @@ module MergeRequestsHelper
["#{source_path}:#{source_branch}", "#{target_path}:#{target_branch}"]
end
end
def merge_request_button_visibility(merge_request, state)
merge_request_state = if merge_request.open?
"open"
else
merge_request.state
end
"hidden" unless merge_request_state === state
end
end
.clearfix.detail-page-header.js-issuable-header{ data: { status: @merge_request.state } }
.issuable-header
.issuable-status-box.status-box.status-box-merged{ class: merge_request_button_visibility(@merge_request, "merged") }
.issuable-status-box.status-box.status-box-merged{ class: ("hidden" unless @merge_request.merged?) }
= icon("check", class: "hidden-sm hidden-md hidden-lg")
%span.hidden-xs
Merged
.issuable-status-box.status-box.status-box-closed{ class: merge_request_button_visibility(@merge_request, "closed") }
.issuable-status-box.status-box.status-box-closed{ class: ("hidden" unless @merge_request.closed?) }
= icon("times", class: "hidden-sm hidden-md hidden-lg")
%span.hidden-xs
Closed
.issuable-status-box.status-box.status-box-open{ class: merge_request_button_visibility(@merge_request, "open") }
.issuable-status-box.status-box.status-box-open{ class: ("hidden" unless @merge_request.open?) }
= icon("circle-o", class: "hidden-sm hidden-md hidden-lg")
%span.hidden-xs
Open
Loading
Loading
@@ -27,13 +27,13 @@
Options
.dropdown-menu.dropdown-menu-align-right.hidden-lg
%ul
%li{ class: merge_request_button_visibility(@merge_request, "open") }
%li{ class: ("hidden" unless @merge_request.open?) }
= link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, title: 'Close merge request'
%li{ class: merge_request_button_visibility(@merge_request, "closed") }
%li{ class: ("hidden" unless @merge_request.closed?) }
= link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'reopen-mr-link', title: 'Reopen merge request'
%li
= link_to 'Edit', edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'issuable-edit'
= link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-close #{merge_request_button_visibility(@merge_request, "open")}", title: 'Close merge request'
= link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-reopen reopen-mr-link #{merge_request_button_visibility(@merge_request, "closed")}", title: 'Reopen merge request'
= link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-close #{("hidden" unless @merge_request.open?)}", title: 'Close merge request'
= link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "hidden-xs hidden-sm btn btn-nr btn-grouped btn-reopen reopen-mr-link #{("hidden" unless @merge_request.closed?)}", title: 'Reopen merge request'
= link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "hidden-xs hidden-sm btn btn-nr btn-grouped issuable-edit" do
Edit
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment