[TikiWiki-commits] [Git][tikiwiki/tiki][27.x] [FIX][UI] User tasks: The tasks in trash do not appear if trash is the only one checked(28.x)

Baraka Kinywa pushed to branch 27.x at Tiki Wiki CMS Groupware / Tiki


Commits:
53a83c76 by christer77 at 2025-08-11T14:20:12+03:00
[FIX][UI] User tasks: The tasks in trash do not appear if trash is the only one checked(28.x)
---
* [FIX][UI] User tasks: The tasks in trash do not appear if trash is the only one checked(28.x)
---
* [FIX][UI] User tasks: The tasks in trash do not appear if trash is the only one checked(29.x)
---
* [FIX][UI] User tasks: The tasks in trash do not appear if trash is the only one checked
---
* [FIX][UI] User tasks: The tasks in trash do not appear if trash is the only one checked

See merge request tikiwiki/tiki!8099

(cherry picked from commit f7178103f2d1bff8131f06f3b63750b89eb41a87)

See merge request tikiwiki/tiki!8238

(cherry picked from commit f69bdf276f44c8f226f5423267cd6b49c74e2be1)

See merge request tikiwiki/tiki!8240

(cherry picked from commit 50d60be148f742cd694465dbfe0a72d5ed09665a)

See merge request tikiwiki/tiki!8251

- - - - -


1 changed file:

- lib/tasks/tasklib.php


Changes:

=====================================
lib/tasks/tasklib.php
=====================================
@@ -383,7 +383,13 @@ class TaskLib extends TikiLib
                 $values[] = "%" . $find . "%";
                 $values[] = "%" . $find . "%";
             }
-            if ($show_trash == false) {
+            if ($show_trash) {
+                $query .= " OR ";
+                $query .= "( `t_history`.`deleted` IS NOT NULL AND  `t_head`.`last_version` = `t_history`.`task_version` AND `t_head`.`taskId` = `t_history`.`belongs_to` ";
+                $query .= "AND `t_head`.`user` = ? AND `t_head`.`creator` = ? ) ";
+                $values[] = $user;
+                $values[] = $user;
+            } else {
                 $query .= " AND ";
                 $query .= "( `t_history`.`deleted` IS NULL) ";
             }



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/53a83c76e5efac2f8fa48359124ba0510e76b288

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/53a83c76e5efac2f8fa48359124ba0510e76b288
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs