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

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


Commits:
f69bdf27 by christer77 at 2025-08-08T18:07:18+03:00
[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

- - - - -


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/f69bdf276f44c8f226f5423267cd6b49c74e2be1

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/f69bdf276f44c8f226f5423267cd6b49c74e2be1
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