Merge branch 'kanban'

2021-12-20 10:59:07 +08:00
parent 2fa7acc4d6 177c9b158f
commit 84fae4bc7d
88 changed files with 5582 additions and 113 deletions
@@ -2809,7 +2809,7 @@ class storyModel extends model
     * @access public
     * @return array
     */
-    public function getUserStories($account, $type = 'assignedTo', $orderBy = 'id_desc', $pager = null, $storyType = 'story')
+    public function getUserStories($account, $type = 'assignedTo', $orderBy = 'id_desc', $pager = null, $storyType = 'story', $includeLibStories = true)
    {
        $sql = $this->dao->select('t1.*, t2.name as productTitle')->from(TABLE_STORY)->alias('t1')
            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id');
@@ -2825,6 +2825,7 @@ class storyModel extends model
            ->beginIF($type == 'reviewedBy')->andWhere("CONCAT(',', reviewedBy, ',')")->like("%,$account,%")->fi()
            ->beginIF($type == 'closedBy')->andWhere('closedBy')->eq($account)->fi()
            ->fi()
+            ->beginIF($includeLibStories == false)->andWhere('t1.lib')->eq('0')->fi()
            ->orderBy($orderBy)
            ->page($pager)
            ->fetchAll('id');