From 8974e7080b2c9db5fe72252e9743ca56eb0237fb Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 14 Dec 2021 17:07:03 +0800
Subject: [PATCH] * Fix the display error of the board.

---
 module/kanban/js/view.js |  4 ++--
 module/kanban/model.php  | 15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 04639cc01d..be6f0d4c6a 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -197,11 +197,11 @@ function renderKanbanItem(item, $item)
     var $title = $item.children('.title');
     if(!$title.length)
     {
-        $title = $('<a class="title" data-toggle="modal" data-width="80%"></a>')
+        $title = $('<a class="title iframe" data-toggle="modal" data-width="80%"></a>')
             .appendTo($item);
     }
     $title.text(item.name);
-    $title.attr('href', createLink('kanban', 'viewCard', 'cardID=' + item.id));
+    $title.attr('href', createLink('kanban', 'viewCard', 'cardID=' + item.id, '', true));
 
     if(item.actions.length)
     {
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 10f8f6c7b4..f097025c0c 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -733,7 +733,8 @@ class kanbanModel extends model
             ->page($pager)
             ->fetchAll('id');
 
-        $kanbanGroup = $this->getGroupBySpaceList(array_keys($spaceList));
+        $kanbanIdList = $this->getCanViewObjects();
+        $kanbanGroup  = $this->getGroupBySpaceList(array_keys($spaceList), $kanbanIdList);
         foreach($spaceList as $spaceID => $space)
         {
             if(isset($kanbanGroup[$spaceID])) $space->kanbans = $kanbanGroup[$spaceID];
@@ -857,6 +858,8 @@ class kanbanModel extends model
             ->remove('uid,contactListMenu')
             ->get();
 
+        $space->whitelist = $space->acl == 'open' ? '' : $space->whitelist;
+
         $space = $this->loadModel('file')->processImgURL($space, $this->config->kanban->editor->editspace['id'], $this->post->uid);
 
         $this->dao->update(TABLE_KANBANSPACE)->data($space)
@@ -996,7 +999,9 @@ class kanbanModel extends model
             ->remove('uid,contactListMenu')
             ->get();
 
-         $kanban = $this->loadModel('file')->processImgURL($kanban, $this->config->kanban->editor->edit['id'], $this->post->uid);
+        $kanban->whitelist = $kanban->acl == 'open' ? '' : $kanban->whitelist;
+
+        $kanban = $this->loadModel('file')->processImgURL($kanban, $this->config->kanban->editor->edit['id'], $this->post->uid);
 
         $this->dao->update(TABLE_KANBAN)->data($kanban)
             ->autoCheck()
@@ -1770,15 +1775,17 @@ class kanbanModel extends model
     /**
      * Get kanban group by space id list.
      *
-     * @param  int    $spaceIdList
+     * @param  array|string $spaceIdList
+     * @param  array|string $kanbanIdList
      * @access public
      * @return array
      */
-    public function getGroupBySpaceList($spaceIdList)
+    public function getGroupBySpaceList($spaceIdList, $kanbanIdList = '')
     {
         return $this->dao->select('*')->from(TABLE_KANBAN)
             ->where('deleted')->eq(0)
             ->andWhere('space')->in($spaceIdList)
+            ->beginIF($kanbanIdList)->andWhere('id')->in($kanbanIdList)->fi()
             ->fetchGroup('space', 'id');
     }