Changeset 12592 for main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Timestamp:

11 Feb 2015, 11:59:34 (10 years ago)

Author:

Henrik Bettermann

Message:

Add 'active' property attribute. Use this attribute to show only active (valid) products to anonymous users.

File:

• main/waeup.ikoba/trunk/src/waeup/ikoba/customers/vocabularies.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/vocabularies.py

@@ -19 +19 @@
 """
 import grok
-from datetime import date
 from zope.component import getUtility, queryUtility
 from zope.catalog.interfaces import ICatalog
@@ -168 +167 @@
         if not concat:
             return products
-        now = date.today()
+        
         resultlist = [
             value for value in products
-            if value.contract_category == concat
-                and (not value.valid_from or value.valid_from <= now)
-                and (not value.valid_to or value.valid_to >= now)
+            if value.contract_category == concat and value.active
             ]
         return resultlist