diff --git a/product/CMFActivity/Activity/SQLBase.py b/product/CMFActivity/Activity/SQLBase.py index c56c8e38b113fdc40475d577c62cf94328ba86f7..ca9c3f80d3ba850957a4eb7dc4bbd97f28f6683d 100644 --- a/product/CMFActivity/Activity/SQLBase.py +++ b/product/CMFActivity/Activity/SQLBase.py @@ -43,8 +43,7 @@ class SQLBase: return result[0][0] def _getPriority(self, activity_tool, method, default): - now_date = self.getNow(activity_tool) - result = method(to_date=now_date) + result = method() assert len(result) == 1 priority = result[0]['priority'] if priority is None: diff --git a/product/CMFActivity/skins/activity/SQLDict_getPriority.zsql b/product/CMFActivity/skins/activity/SQLDict_getPriority.zsql index dbb24f2eefe28cc5a18a7fea42418195c3d5fad0..1a55ac7c7d4940b7cd5df9e9ebdccd04429108e8 100644 --- a/product/CMFActivity/skins/activity/SQLDict_getPriority.zsql +++ b/product/CMFActivity/skins/activity/SQLDict_getPriority.zsql @@ -8,11 +8,10 @@ class_name: class_file: </dtml-comment> <params> -to_date </params> SELECT MIN(`priority`) AS `priority` FROM message WHERE processing_node = 0 - AND date <= <dtml-sqlvar to_date type="datetime"> + AND date <= UTC_TIMESTAMP() diff --git a/product/CMFActivity/skins/activity/SQLQueue_getPriority.zsql b/product/CMFActivity/skins/activity/SQLQueue_getPriority.zsql index 019bcc6f728a98a6d10089c33308ce29738b8d01..57d8ebeafc5e3cde654a87bd54bc017b48057b5c 100644 --- a/product/CMFActivity/skins/activity/SQLQueue_getPriority.zsql +++ b/product/CMFActivity/skins/activity/SQLQueue_getPriority.zsql @@ -8,11 +8,10 @@ class_name: class_file: </dtml-comment> <params> -to_date </params> SELECT MIN(`priority`) AS `priority` FROM message_queue WHERE processing_node = 0 - AND date <= <dtml-sqlvar to_date type="datetime"> + AND date <= UTC_TIMESTAMP()