浏览代码

fixed special filters in TableAjax and acl query builder

Piotr Labudda 8 年之前
父节点
当前提交
6b11caf04a
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      SE/se-lib/AclQueryFeatures.php

+ 6 - 2
SE/se-lib/AclQueryFeatures.php

@@ -196,11 +196,15 @@ class AclQueryFeatures {
 	public function parseSpecialFilterSpotkania($type) {
 		DBG::log($type, 'string', "parse SpecialFilter Spotkania");
 		switch ($type) {
-			case 'OLD': return ['L_APPOITMENT_DATE', 'UNIX_TIMESTAMP_LESS_THAN_NOW'];
+			case 'OLD': return ['L_APPOITMENT_DATE', 'and', [
+				['L_APPOITMENT_DATE', 'UNIX_TIMESTAMP_LESS_THAN_NOW'],
+			] ];
 			//					 COALESCE(UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`), 0) < UNIX_TIMESTAMP()
 			//					 and t.`L_APPOITMENT_DATE` != ''
 			//					 and t.`L_APPOITMENT_DATE` != '0000-00-00 00:00:00'
-			case 'NOW': return ['L_APPOITMENT_DATE', 'UNIX_TIMESTAMP_NOW_3600'];
+			case 'NOW': return ['L_APPOITMENT_DATE', 'and', [
+				[ 'L_APPOITMENT_DATE', 'UNIX_TIMESTAMP_NOW_3600'],
+			] ];
 			//					 COALESCE(UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`), 0) < UNIX_TIMESTAMP()+3600
 			//					 and COALESCE(UNIX_TIMESTAMP(t.`L_APPOITMENT_DATE`), 0) > UNIX_TIMESTAMP()-3600
 			case 'TODAY': return ['L_APPOITMENT_DATE', 'and', [