From d47ec7a0cd6c27a7099f6e1aa5d49511dba8f939 Mon Sep 17 00:00:00 2001
From: Matchu <matchu1993@gmail.com>
Date: Wed, 2 Apr 2014 20:40:51 -0500
Subject: [PATCH] when advanced query is empty, go blank instead of saying no
 results

---
 app/assets/javascripts/outfits/edit.js |  4 +--
 app/assets/javascripts/wardrobe.js     | 47 +++++++++++++++-----------
 app/models/item/search/query.rb        |  4 +--
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/outfits/edit.js b/app/assets/javascripts/outfits/edit.js
index 1e98883c..85de6a27 100644
--- a/app/assets/javascripts/outfits/edit.js
+++ b/app/assets/javascripts/outfits/edit.js
@@ -1166,7 +1166,7 @@ View.Search = function (wardrobe) {
     var fit = $('#preview').data('fit') || $.noop;
     stopLoading();
     item_set.setItems(items);
-    if(wardrobe.search.request.query) {
+    if(wardrobe.search.request.query.length > 0) {
       if(!items.length) {
         no_results_el.show();
       }
@@ -1186,7 +1186,7 @@ View.Search = function (wardrobe) {
     var human_query = typeof current_query === 'string' ? current_query : '';
     input_el.val(human_query);
     no_results_span.text(human_query);
-    clear_el.toggle(!!request.query);
+    clear_el.toggle(!!request.query && request.query.length > 0);
   });
 
   wardrobe.search.bind('updatePagination', function (current_page, total_pages) {
diff --git a/app/assets/javascripts/wardrobe.js b/app/assets/javascripts/wardrobe.js
index ebc0e040..6e8797b5 100644
--- a/app/assets/javascripts/wardrobe.js
+++ b/app/assets/javascripts/wardrobe.js
@@ -216,23 +216,11 @@ function Wardrobe() {
 
   Item.PER_PAGE = 21;
 
-  function queryToFilters(query) {
-    if (typeof query === "string") return query;
-    var filters = [];
-    if (query.name.require)
-      filters.push({key: "name", value: query.name.require, is_positive: true});
-    if (query.name.exclude)
-      filters.push({key: "name", value: query.name.exclude, is_positive: false});
-    if (query.nc)
-      filters.push({key: "is_nc", is_positive: (query.nc === "nc")});
-    return filters;
-  }
-
   Item.loadByQuery = function (query, offset, success, error) {
     var page = Math.round(offset / Item.PER_PAGE) + 1;
     $.ajax({
       url: '/items.json',
-      data: {q: queryToFilters(query), per_page: Item.PER_PAGE, page: page},
+      data: {q: query, per_page: Item.PER_PAGE, page: page},
       dataType: 'json',
       success: function (data) {
         var items = [], item, item_data;
@@ -1342,6 +1330,24 @@ function Wardrobe() {
       search.events.trigger('error', error);
     }
 
+    function queryToFilters(query) {
+      if (typeof query === "string") return query;
+      var filters = [];
+      if (query.name.require)
+        filters.push({key: "name", value: query.name.require, is_positive: true});
+      if (query.name.exclude)
+        filters.push({key: "name", value: query.name.exclude, is_positive: false});
+      if (query.nc)
+        filters.push({key: "is_nc", is_positive: (query.nc === "nc")});
+      if (query.occupies)
+        filters.push({key: "occupied_zone_set_name", value: query.occupies,
+                      is_positive: true});
+      if (query.restricts)
+        filters.push({key: "restricted_zone_set_name", value: query.restricts,
+                      is_positive: true});
+      return filters;
+    }
+
     this.setItemsByQuery = function (query, where) {
       var offset = (typeof where.offset != 'undefined') ? where.offset : (Item.PER_PAGE * (where.page - 1));
       search.request = {
@@ -1349,12 +1355,15 @@ function Wardrobe() {
         offset: offset
       };
       search.events.trigger('updateRequest', search.request);
-      if(query) {
-        Item.loadByQuery(query, offset, itemsOnLoad, itemsOnError);
-        search.events.trigger('startRequest');
-      } else {
-        search.events.trigger('updateItems', []);
-        search.events.trigger('updatePagination', 0, 0);
+      if (typeof query !== "undefined") {
+        var newQuery = queryToFilters(query);
+        if(newQuery.length > 0) { // works for strings *or* filters lists!
+          Item.loadByQuery(newQuery, offset, itemsOnLoad, itemsOnError);
+          search.events.trigger('startRequest');
+        } else {
+          search.events.trigger('updateItems', []);
+          search.events.trigger('updatePagination', 0, 0);
+        }
       }
     }
 
diff --git a/app/models/item/search/query.rb b/app/models/item/search/query.rb
index e77a86a9..b2ca1ef4 100644
--- a/app/models/item/search/query.rb
+++ b/app/models/item/search/query.rb
@@ -166,8 +166,8 @@ class Item
         species: lambda { |id|
           Species.find(id).name
         },
-        zone: lambda { |id|
-          Zone.find(id).plain_label
+        zone: lambda { |ids|
+          Zone.find(ids.first).plain_label
         },
         ownership: lambda { |owned|
           owned_key = owned ? 'owns' : 'wants'