* Fix bug #21403,21474,21410,21414,21417,21456.

This commit is contained in:
tanghucheng
2022-04-07 15:27:54 +08:00
parent adb3a7ea72
commit 3d3ffe9348
11 changed files with 28 additions and 15 deletions
+1
View File
@@ -1,3 +1,4 @@
.table-footer {z-index: 1;}
.closed, .closed a {color: gray; text-decoration:line-through;}
.resolved, .resolved a {color: #8EC21F; text-decoration: none;}
.tree .closed, .tree .closed a {color: #003366; text-decoration: none;}
+2
View File
@@ -158,6 +158,7 @@ class groupModel extends model
->on('t1.`group` = t2.id')
->where('t1.account')->eq($account)
->andWhere('t2.project')->eq(0)
->andWhere('t2.vision')->eq($this->config->vision)
->fetchAll('id');
}
@@ -174,6 +175,7 @@ class groupModel extends model
->leftJoin(TABLE_GROUP)->alias('t2')
->on('t1.`group` = t2.id')
->where('t1.account')->in($accounts)
->andWhere('t2.vision')->eq($this->config->vision)
->fetchGroup('account');
}
+1 -3
View File
@@ -251,7 +251,7 @@ EOF;
/* Load pager. */
$this->app->loadClass('pager', $static = true);
if($this->app->getViewType() == 'mhtml') $recPerPage = 10;
$pager = pager::init($recTotal, $recPerPage, $pageID);
$pager = new pager($recTotal, $recPerPage, $pageID);
if(empty($userID)) $userID = $this->app->user->id;
$user = $this->loadModel('user')->getById($userID, 'id');
@@ -271,8 +271,6 @@ EOF;
if($todo->type == 'task' and isset($tasks[$todo->idvalue])) unset($todos[$key]);
}
$pager->recTotal = count($todos);
/* Assign. */
$this->view->todos = $todos;
$this->view->date = (int)$type == 0 ? date(DT_DATE1) : date(DT_DATE1, strtotime($type));
+1
View File
@@ -28,6 +28,7 @@ a.removeModule:hover {color: red;}
.table td.has-child > .story-toggle.collapsed > .icon {-ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -o-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg);}
.table td.c-estimate {padding-right: 12px;}
.main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
.table-footer {z-index: 1;}
@-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};}
#batchUnlinkStoryTip .modal-body {padding-top: 10px; max-height: 400px; overflow: auto;}
+1 -1
View File
@@ -35,7 +35,7 @@ $config->task->exportFields = '
openedBy, openedDate, assignedTo, assignedDate,
finishedBy, finishedDate, canceledBy, canceledDate,
closedBy, closedDate, closedReason,
lastEditedBy, lastEditedDate, avtivatedDate, files
lastEditedBy, lastEditedDate, activatedDate, files
';
$config->task->customCreateFields = 'story,estStarted,deadline,mailto,pri,estimate';
+1
View File
@@ -36,3 +36,4 @@
.table-bordered > #steps > tr > td textarea:hover {border-color: #808080;}
.table-bordered > #steps > tr > td textarea:focus {border-color: #4d90fe;}
.table-bordered > #steps .step-child .step-child-id {border-right: 1px dotted #ddd; border-left: none;}
.table-footer {z-index: 1;}