* Fix Kanban related issues.
This commit is contained in:
@@ -2070,7 +2070,7 @@ class execution extends control
|
||||
|
||||
$userList = array();
|
||||
$users = $this->loadModel('user')->getPairs('noletter|nodeleted');
|
||||
$avatarPairs = $this->user->getAvatarPairs();
|
||||
$avatarPairs = $this->user->getAvatarPairs('all');
|
||||
foreach($avatarPairs as $account => $avatar)
|
||||
{
|
||||
if(!isset($users[$account])) continue;
|
||||
|
||||
@@ -68,7 +68,6 @@
|
||||
.kanban-col[data-type=ADD] {display: none;}
|
||||
.kanban-col[data-type=EMPTY] {display: none;}
|
||||
.kanban-col {padding-right: 0px !important;}
|
||||
.kanban-item:hover .title {padding-right: 10px;}
|
||||
.gray .actions {display:none;}
|
||||
|
||||
.c-type {width: 150px !important; overflow: unset;}
|
||||
|
||||
@@ -1499,9 +1499,11 @@ function resetRegionHeight(fold)
|
||||
$('.kanban-lane').each(function()
|
||||
{
|
||||
laneCount ++;
|
||||
if(laneCount > 1) return true;
|
||||
if(laneCount > 1) return;
|
||||
});
|
||||
|
||||
if(laneCount > 1) return;
|
||||
|
||||
var regionHeaderHeight = $('.region-header').outerHeight();
|
||||
if(fold == 'open')
|
||||
{
|
||||
|
||||
@@ -1225,6 +1225,8 @@ function resetKanbanHeight()
|
||||
if(laneCount > 1) return true;
|
||||
});
|
||||
|
||||
if(laneCount > 1) return true;
|
||||
|
||||
var windowHeight = $(window).height();
|
||||
var headerHeight = $('#mainHeader').outerHeight();
|
||||
var mainPadding = $('#main').css('padding-top');
|
||||
|
||||
@@ -260,7 +260,7 @@ class project extends control
|
||||
$this->view->kanbanList = $kanbanList;
|
||||
$this->view->browseType = $browseType;
|
||||
$this->view->memberGroup = $this->execution->getMembersByIdList(array_keys($kanbanList));
|
||||
$this->view->usersAvatar = $this->loadModel('user')->getAvatarPairs();
|
||||
$this->view->usersAvatar = $this->loadModel('user')->getAvatarPairs('all');
|
||||
$this->view->executionActions = $executionActions;
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,8 @@ class userModel extends model
|
||||
public function getList($params = 'nodeleted')
|
||||
{
|
||||
return $this->dao->select('*')->from(TABLE_USER)
|
||||
->where('type')->eq('inside')
|
||||
->where(true)
|
||||
->beginIF(strpos($params, 'all') === false)->andWhere('type')->eq('inside')->fi()
|
||||
->beginIF(strpos($params, 'nodeleted') !== false)->andWhere('deleted')->eq(0)->fi()
|
||||
->orderBy('account')
|
||||
->fetchAll();
|
||||
|
||||
Reference in New Issue
Block a user