@@ -10,7 +10,6 @@ class ProductAdminFilterSet(filters.FilterSet):
1010 name = MultiFieldOrCharInFilter (field_names = ["name_ko" , "name_en" ], lookup_expr = "icontains" )
1111 category = filters .BaseInFilter (field_name = "category_id" )
1212 category_group = filters .BaseInFilter (field_name = "category__group_id" )
13- hidden = filters .BooleanFilter (field_name = "hidden" )
1413 tag = filters .BaseInFilter (field_name = "tag_set" , distinct = True )
1514
1615 price_min = filters .NumberFilter (field_name = "price" , lookup_expr = "gte" )
@@ -22,21 +21,17 @@ def filter_by_status(self, queryset, name, values):
2221 now = now_aware ()
2322 q = Q ()
2423 for value in values :
25- if value == Product .CurrentStatus .HIDDEN :
26- q |= Q (hidden = True )
27- elif value == Product .CurrentStatus .OUT_OF_VISIBLE_PERIOD :
28- q |= Q (hidden = False ) & (Q (visible_starts_at__gt = now ) | Q (visible_ends_at__lt = now ))
24+ if value == Product .CurrentStatus .OUT_OF_VISIBLE_PERIOD :
25+ q |= Q (visible_starts_at__gt = now ) | Q (visible_ends_at__lt = now )
2926 elif value == Product .CurrentStatus .OUT_OF_ORDERABLE_PERIOD :
3027 q |= (
31- Q (hidden = False )
32- & Q (visible_starts_at__lte = now )
28+ Q (visible_starts_at__lte = now )
3329 & Q (visible_ends_at__gte = now )
3430 & (Q (orderable_starts_at__gt = now ) | Q (orderable_ends_at__lt = now ))
3531 )
3632 elif value == Product .CurrentStatus .ACTIVE :
3733 q |= (
38- Q (hidden = False )
39- & Q (visible_starts_at__lte = now )
34+ Q (visible_starts_at__lte = now )
4035 & Q (visible_ends_at__gte = now )
4136 & Q (orderable_starts_at__lte = now )
4237 & Q (orderable_ends_at__gte = now )
@@ -50,7 +45,6 @@ class Meta:
5045 "name" ,
5146 "category" ,
5247 "category_group" ,
53- "hidden" ,
5448 "tag" ,
5549 "price_min" ,
5650 "price_max" ,
0 commit comments