From 8ad030baba0ce7c13bf09dfba31907bd7599cd98 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Tue, 20 Dec 2016 09:03:14 +1300
Subject: [PATCH] FIX Make GridField filter button selector more specific

---
 admin/client/dist/js/bundle.js       | 4 ++--
 admin/client/src/legacy/GridField.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/admin/client/dist/js/bundle.js b/admin/client/dist/js/bundle.js
index 86ac7a3ba..193f19f85 100644
--- a/admin/client/dist/js/bundle.js
+++ b/admin/client/dist/js/bundle.js
@@ -2106,8 +2106,8 @@ n||(n={}),n.data||(n.data=[]),n.data=n.data.concat(l),window.location.search&&(n
 r.removeClass("show-filter").find(".filter-header").hide()),r.find(".sortable-header th:last").html(s)}o.removeClass("loading"),i&&i.apply(this,arguments),r.trigger("reload",r)},error:function c(e){alert(s["default"]._t("GRIDFIELD.ERRORINTRANSACTION")),
 o.removeClass("loading")}},n))},showDetailView:function n(e){window.location.href=e},getItems:function i(){return this.find(".ss-gridfield-item")},setState:function r(e,t){var n=this.getState()
 n[e]=t,this.find(':input[name="'+this.data("name")+'[GridState]"]').val(JSON.stringify(n))},getState:function o(){return JSON.parse(this.find(':input[name="'+this.data("name")+'[GridState]"]').val())}}),
-e(".grid-field *").entwine({getGridField:function a(){return this.closest(".grid-field")}}),e(".grid-field :button[name=showFilter]").entwine({onclick:function l(t){e(".filter-header").show("slow").find(":input:first").focus(),
-this.closest(".grid-field").addClass("show-filter"),this.parent().html('<span class="non-sortable"></span>'),t.preventDefault()}}),e(".grid-field .ss-gridfield-item").entwine({onclick:function u(t){if(e(t.target).closest(".action").length)return this._super(t),
+e(".grid-field *").entwine({getGridField:function a(){return this.closest(".grid-field")}}),e(".grid-field :button[name=showFilter]").entwine({onclick:function l(e){this.closest(".grid-field__table").find(".filter-header").show("slow").find(":input:first").focus(),
+this.closest(".grid-field").addClass("show-filter"),this.parent().html('<span class="non-sortable"></span>'),e.preventDefault()}}),e(".grid-field .ss-gridfield-item").entwine({onclick:function u(t){if(e(t.target).closest(".action").length)return this._super(t),
 !1
 var n=this.find(".edit-link")
 n.length&&this.getGridField().showDetailView(n.prop("href"))},onmouseover:function c(){this.find(".edit-link").length&&this.css("cursor","pointer")},onmouseout:function d(){this.css("cursor","default")
diff --git a/admin/client/src/legacy/GridField.js b/admin/client/src/legacy/GridField.js
index ae7c15497..98560d7cb 100644
--- a/admin/client/src/legacy/GridField.js
+++ b/admin/client/src/legacy/GridField.js
@@ -104,7 +104,8 @@ $.entwine('ss', function($) {
 
 	$('.grid-field :button[name=showFilter]').entwine({
 		onclick: function(e) {
-			$('.filter-header')
+			this.closest('.grid-field__table')
+				.find('.filter-header')
 				.show('slow') // animate visibility
 				.find(':input:first').focus(); // focus first search field
 			this.closest('.grid-field').addClass('show-filter');