* Adjust my ticket file to zentaoext.

This commit is contained in:
wangyuting
2024-04-17 14:37:11 +08:00
parent a9ab2fd215
commit f37bd06f97
2 changed files with 2 additions and 36 deletions
+2 -1
View File
@@ -734,7 +734,7 @@ class my extends control
$this->view->users = $this->user->getPairs('noclosed|noletter');
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->type = $type;
$this->view->type = $browseType;
$this->view->param = $param;
$this->view->issues = $type == 'assignedBy' ? $this->my->getAssignedByMe($this->app->user->account, $pager, $orderBy, 'issue') : $this->loadModel('issue')->getUserIssues($type, $queryID, $this->app->user->account, $orderBy, $pager);
$this->view->projectList = $this->loadModel('project')->getPairsByProgram();
@@ -793,6 +793,7 @@ class my extends control
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->type = $type;
$this->view->param = $param;
$this->view->mode = 'risk';
$this->view->projectList = $this->loadModel('project')->getPairsByProgram();
$this->display();
-35
View File
@@ -1,35 +0,0 @@
<?php
declare(strict_types=1);
/**
* The ticket view file of my module of ZenTaoPMS.
* @copyright Copyright 2009-2023 禅道软件(青岛)有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
* @license ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
* @author Yuting Wang <wangyuting@easycorp.ltd>
* @package my
* @link https://www.zentao.net
*/
namespace zin;
include 'header.html.php';
featureBar
(
set::current($browseType),
set::linkParams("mode={$mode}&type={key}&param=&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"),
li(searchToggle(set::module('workTicket'), set::open($browseType == 'bysearch')))
);
$tickets = initTableData($tickets, $config->my->ticket->dtable->fieldList, $this->ticket);
dtable
(
set::cols(array_values($config->my->ticket->dtable->fieldList)),
set::data(array_values($tickets)),
set::userMap($users),
set::fixedLeftWidth('44%'),
set::orderBy($orderBy),
set::sortLink(createLink('my', $app->rawMethod, "mode={$mode}&type={$browseType}&param={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::footPager(usePager())
);
render();