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

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.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• customers/vocabularies.py (modified) (2 diffs)
• products/browser_templates/containerpage.pt (modified) (1 diff)
• products/product.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

main/waeup.ikoba/trunk/src/waeup/ikoba/products/browser_templates/containerpage.pt

@@ -12 +12 @@
   </thead>
   <tbody>
-    <tr tal:repeat="value context/values">
-      <td> <a tal:attributes="href python: view.url(value)">
-          <span tal:content="value/product_id">ID</span></a></td>
-      <td tal:content="value/title">TITLE</td>
-      <td tal:content="value/contract_category_title">CATEGORY</td>
-    </tr>
+    <tal:repeat repeat="value context/values">
+      <tr tal:condition="python:layout.isAuthenticated() or value.active">
+        <td> <a tal:attributes="href python: view.url(value)">
+            <span tal:content="value/product_id">ID</span></a></td>
+        <td tal:content="value/title">TITLE</td>
+        <td tal:content="value/contract_category_title">CATEGORY</td>
+      </tr>
+    </tal:repeat>
   </tbody>
 </table>

main/waeup.ikoba/trunk/src/waeup/ikoba/products/product.py

@@ -22 +22 @@
 from time import time
 from grok import index
+from datetime import date
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from zope.event import notify
@@ -62 +63 @@
             return self.contract_title
         return self.title
+
+    @property
+    def active(self):
+        now = date.today()
+        return (not self.valid_from or self.valid_from <= now) and \
+               (not self.valid_to or self.valid_to >= now)
 
 Product = attrs_to_fields(Product)