Refactor filters

Refactor filters and views.

1 files changed, 10 insertions, 13 deletions

diff --git a/saleor/product/filters.py b/saleor/product/filters.py
index 68f785e1..170c6a1b 100644
--- a/saleor/product/filters.py
+++ b/saleor/product/filters.py
@@ -9,11 +9,9 @@ from .models import Product, AttributeChoiceValue
 class ProductFilter(FilterSet):
     def __init__(self, *args, **kwargs):
         super(ProductFilter, self).__init__(*args, **kwargs)
-        self.products = self.queryset
-
         product_attributes = set()
         variant_attributes = set()
-        for product in self.products:
+        for product in self.queryset:
             for attribute in product.product_class.variant_attributes.all():
                 product_attributes.add(attribute)
             for attribute in product.product_class.product_attributes.all():
@@ -25,8 +23,7 @@ class ProductFilter(FilterSet):
                     name='product_class__product_attributes__values__slug',
                     label=attribute.name,
                     widget=CheckboxSelectMultiple,
-                    choices=self.get_attribute_choices(attribute)
-                )
+                    choices=get_attribute_choices(attribute))
 
         for attribute in variant_attributes:
             self.filters[attribute.slug] = \
@@ -34,14 +31,7 @@ class ProductFilter(FilterSet):
                     name='product_class__variant_attributes__values__slug',
                     label=attribute.name,
                     widget=CheckboxSelectMultiple,
-                    choices=self.get_attribute_choices(attribute)
-                )
-
-    def get_attribute_choices(self, attribute):
-        result = [(choice.slug, choice.name)
-                  for choice in AttributeChoiceValue.objects
-                      .filter(attribute__name=attribute.name)]
-        return result
+                    choices=get_attribute_choices(attribute))
 
     class Meta:
         model = Product
@@ -52,3 +42,10 @@ class ProductFilter(FilterSet):
                 'filter_class': RangeFilter
             }
         }
+
+
+def get_attribute_choices(self, attribute):
+    result = [(choice.slug, choice.name)
+              for choice in AttributeChoiceValue.objects
+                  .filter(attribute__name=attribute.name)]
+    return result