Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix the display error of the board.

Browse Source
This commit is contained in:
tianshujie
2021-12-14 17:07:03 +08:00
parent fcf709a7b4
commit 8974e7080b
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/js/view.js
+2 -2
View File
@@ -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)
{
module/kanban/model.php
+11 -4
View File
@@ -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');
}