diff --git a/module/my/config/table.php b/module/my/config/table.php index afd89f311b..81378ccc44 100644 --- a/module/my/config/table.php +++ b/module/my/config/table.php @@ -1131,3 +1131,4 @@ unset($config->my->team->dtable->fieldList['actions']); $config->my->project = new stdclass(); $config->my->project->dtable = $config->project->dtable; + diff --git a/module/my/control.php b/module/my/control.php index 95f0f47694..a4c51c25a4 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -1079,6 +1079,7 @@ class my extends control $this->view->tickets = $tickets; $this->view->orderBy = $orderBy; $this->view->pager = $pager; + $this->view->param = $param; $this->view->browseType = $browseType; $this->view->mode = 'ticket'; $this->display(); diff --git a/module/my/ui/feedback.html.php b/module/my/ui/feedback.html.php index 50dc4e3e57..189db59101 100644 --- a/module/my/ui/feedback.html.php +++ b/module/my/ui/feedback.html.php @@ -1,7 +1,7 @@ @@ -72,8 +72,7 @@ dtable set::customCols(true), set::sortLink(createLink('my', $app->rawMethod, "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::footPager(usePager()), - set::footToolbar($footToolbar), - set::emptyTip($lang->task->noTask) + set::footToolbar($footToolbar) ); render(); diff --git a/module/my/ui/ticket.html.php b/module/my/ui/ticket.html.php new file mode 100644 index 0000000000..e1a2cf1025 --- /dev/null +++ b/module/my/ui/ticket.html.php @@ -0,0 +1,35 @@ + + * @package my + * @link https://www.zentao.net + */ +namespace zin; + +include 'header.html.php'; + +featureBar +( + set::current($browseType), + set::linkParams("mode={$mode}&type={key}¶m=&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}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), + set::footPager(usePager()) +); + +render();