From 58b127ac084fafac461120eea22de012642e68c6 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Thu, 28 Oct 2010 07:40:48 +0200 Subject: [PATCH] Fix up broken filter toggles while searching --- gui/marketBrowser.py | 4 +++- service/market.py | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 5f5aeb07a..543bd5104 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -286,7 +286,9 @@ class ItemView(d.Display): self.items = items if items is not None else self.items self.usedMetas = usedMetas if usedMetas is not None else self.usedMetas - self.update(self.items) + sMarket = service.Market.getInstance() + + self.update(sMarket.filterItems(self.items)) #Gray out empty toggles self.toggleButtons(self.usedMetas) diff --git a/service/market.py b/service/market.py index c99c26771..e5fc4837a 100644 --- a/service/market.py +++ b/service/market.py @@ -220,6 +220,15 @@ class Market(): def isMetaIdActive(self, meta): return meta in self.activeMetas + def filterItems(self, items): + filtered = [] + activeMetas = self.activeMetas + for it in items: + if (it.metaGroup.ID if it.metaGroup is not None else 1) in activeMetas: + filtered.append(it) + + return filtered + def getMetaName(self, metaId): for name, ids in self.META_MAP.items(): for id in ids: