fix: activity date type (ZBS)

zms-publishing · Mar 7, 2024 · 9f6365f · 9f6365f
1 parent 0e5f7f8
commit 9f6365f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Products/zms/_objattrs.py b/Products/zms/_objattrs.py
@@ -691,13 +691,19 @@ def isActive(self, REQUEST):
           # Start time.
           elif key == 'attr_active_start':
             if value is not None:
+              if isinstance(value, time.struct_time):
+                # Convert time.struct_time to datetime tuple.
+                value = tuple(value[:8]) + (0,)
               dt = datetime.datetime.fromtimestamp(time.mktime(value))
               b = b and now > dt
               if dt > now and self.REQUEST.get('ZMS_CACHE_EXPIRE_DATETIME', dt) >= dt:
                 self.REQUEST.set('ZMS_CACHE_EXPIRE_DATETIME',dt)
           # End time.
           elif key == 'attr_active_end':
             if value is not None:
+              if isinstance(value, time.struct_time):
+                # Convert time.struct_time to datetime tuple.
+                value = tuple(value[:8]) + (0,)
               dt = datetime.datetime.fromtimestamp(time.mktime(value))
               b = b and dt > now
               if dt > now and self.REQUEST.get('ZMS_CACHE_EXPIRE_DATETIME', dt) >= dt: