From 21f54dd4ff8c69d86ef95fcaf5f31ffd5c155a73 Mon Sep 17 00:00:00 2001
From: carole_grieve_eqtr <carole.grieve@eqtr.com>
Date: Mon, 20 Mar 2017 17:55:48 +0000
Subject: [PATCH] Remove the relevant query rather than the first one!

---
 .../overlays/querybuilder/querybuilder.controller.js  | 11 ++++++++---
 .../common/overlays/querybuilder/querybuilder.html    |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.controller.js
index 3c0199d7bd..979428de0c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.controller.js
@@ -122,9 +122,14 @@
             query.filters.push({});
         }
 
-        function trashFilter(query) {
-            query.filters.splice(query, 1);
-
+        function trashFilter(query, filter) {
+            for (var i = 0; i < query.filters.length; i++)
+            {
+                if (query.filters[i] == filter)
+                {
+                    query.filters.splice(i, 1);
+                }
+            }
             //if we remove the last one, add a new one to generate ui for it.
             if (query.filters.length == 0) {
                 query.filters.push({});
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.html
index 70c457ef12..d469c45181 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/querybuilder/querybuilder.html
@@ -91,7 +91,7 @@
 					<i class="icon-add"></i>
 				</a>
 
-				<a href ng-click="vm.trashFilter(vm.query)">
+				<a href ng-click="vm.trashFilter(vm.query, filter)">
 					<i class="icon-trash"></i>
 				</a>