From 2ec8721920cb91d518659a7369211e7d6fbec18c Mon Sep 17 00:00:00 2001
From: Edin Dazdarevic <edin.dazdarevic@gmail.com>
Date: Wed, 11 Feb 2015 08:56:03 +0100
Subject: [PATCH] bug fix filtering

---
 front-ui/app/components/browsing/byCategory.js | 9 ++++++---
 front-ui/app/models/itemCollection.js          | 3 +++
 front-ui/app/stores/itemStore.js               | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/front-ui/app/components/browsing/byCategory.js b/front-ui/app/components/browsing/byCategory.js
index 1dd2766..b27afe6 100644
--- a/front-ui/app/components/browsing/byCategory.js
+++ b/front-ui/app/components/browsing/byCategory.js
@@ -40,8 +40,6 @@ var ByCategory = React.createClass({
       var q = {};
       NavigationActions.goToCategory(category, section, q);
 
-      var categoryId = this.getParams().id;
-      ItemActions.loadByCategory(categoryId, this.getQuery());
     },
     render: function() {
       var self = this;
@@ -101,8 +99,9 @@ var ByCategory = React.createClass({
       return filters;
     },
     componentWillReceiveProps: function() {
+      console.log("RECEIVING PROPS!!!!!!!!!!!!!!!!!!!!!!!!");
       var categoryId = this.getParams().id;
-      ItemActions.loadByCategory(categoryId, this.getQuery());
+      ItemActions.loadByCategory(categoryId, FilterCriteriaStore.getAppliedCategoryFilters());
       CategoryActions.loadCategoryDetails(categoryId);
     },
     componentDidMount: function() {
@@ -126,6 +125,10 @@ var ByCategory = React.createClass({
         this.setState({
           appliedCategoryFilters: FilterCriteriaStore.getAppliedCategoryFilters() 
         });
+        var categoryId = this.getParams().id;
+        //ItemActions.loadByCategory(categoryId, FilterCriteriaStore.getAppliedCategoryFilters());
+      //CategoryActions.loadCategoryDetails(categoryId);
+
       }
     },
     _onChange: function() {
diff --git a/front-ui/app/models/itemCollection.js b/front-ui/app/models/itemCollection.js
index ad902c4..914d92b 100644
--- a/front-ui/app/models/itemCollection.js
+++ b/front-ui/app/models/itemCollection.js
@@ -8,6 +8,9 @@ var ItemCollection = Backbone.Collection.extend({
     this.filters = this.filters || {};
     this.filters[name] = value;
   },
+    clearFilter: function() {
+      this.filters = [];
+    },
 	setLimit: function(limit) {
         this.queryLimit = limit;        
     },
diff --git a/front-ui/app/stores/itemStore.js b/front-ui/app/stores/itemStore.js
index 2573ac7..688938e 100644
--- a/front-ui/app/stores/itemStore.js
+++ b/front-ui/app/stores/itemStore.js
@@ -53,6 +53,7 @@ var fetchItemWithDetails = function() {
 
 var fetchItemsByCategory = function(categoryId, query) {
   var items = _itemsByCategory;
+  items.clearFilter();
   items.setClassificationType(2);
   items.setClassificationId(categoryId);
   items.setLimit(30);