diff options
4 files changed, 17 insertions, 6 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee index ed978f1bdb2..269f2008e2d 100644 --- a/app/assets/javascripts/labels_select.js.coffee +++ b/app/assets/javascripts/labels_select.js.coffee @@ -58,6 +58,7 @@ class @LabelsSelect if showAny data.unshift( + any: true title: 'Any Label' ) @@ -91,11 +92,15 @@ class @LabelsSelect defaultLabel fieldName: $(dropdown).data('field-name') id: (label) -> - if label.title is "Any Label" + if label.any? "" else label.title clicked: -> - if $(dropdown).hasClass "js-filter-submit" + page = $("body").data "page" + + if $(dropdown).hasClass("js-filter-submit") && page is "projects:issues:index" Issues.filterResults $(dropdown).parents("form") + else if $(dropdown).hasClass "js-filter-submit" + $(dropdown).parents("form").submit() ) diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee index f38c375c61a..a4bf8654de4 100644 --- a/app/assets/javascripts/milestone_select.js.coffee +++ b/app/assets/javascripts/milestone_select.js.coffee @@ -62,6 +62,10 @@ class @MilestoneSelect isSelected: (milestone) -> milestone.title is selectedMilestone clicked: -> - if $(dropdown).hasClass "js-filter-submit" + page = $("body").data "page" + + if $(dropdown).hasClass("js-filter-submit") && page is "projects:issues:index" Issues.filterResults $(dropdown).parents("form") + else if $(dropdown).hasClass "js-filter-submit" + $(dropdown).parents("form").submit() ) diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee index 46faae111c4..44ed31d04b2 100644 --- a/app/assets/javascripts/users_select.js.coffee +++ b/app/assets/javascripts/users_select.js.coffee @@ -60,8 +60,12 @@ class @UsersSelect else defaultLabel clicked: -> - if $(dropdown).hasClass "js-filter-submit" + page = $("body").data "page" + + if $(dropdown).hasClass("js-filter-submit") && page is "projects:issues:index" Issues.filterResults $(dropdown).parents("form") + else if $(dropdown).hasClass "js-filter-submit" + $(dropdown).parents("form").submit() renderRow: (user) -> username = if user.username then "@#{user.username}" else "" avatar = if user.avatar_url then user.avatar_url else false diff --git a/spec/features/merge_requests/filter_by_milestone_spec.rb b/spec/features/merge_requests/filter_by_milestone_spec.rb index 1b2fd1bab10..b76e4c74c79 100644 --- a/spec/features/merge_requests/filter_by_milestone_spec.rb +++ b/spec/features/merge_requests/filter_by_milestone_spec.rb @@ -30,8 +30,6 @@ feature 'Merge Request filtering by Milestone', feature: true do def filter_by_milestone(title) find(".js-milestone-select").click - sleep 0.5 find(".milestone-filter a", text: title).click - sleep 1 end end |