From 4bab4bc356d2e2e771f933e3ef20183c5fa848b2 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Mon, 17 Oct 2022 14:01:04 +0800
Subject: [PATCH] * Fix some bugs of ticket.

---
 module/my/control.php          | 2 +-
 module/my/css/ticket.css       | 5 +++++
 module/my/model.php            | 2 +-
 module/my/view/ticket.html.php | 6 +++---
 4 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 module/my/css/ticket.css

diff --git a/module/my/control.php b/module/my/control.php
index ff44003655..746a4150e8 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -1249,7 +1249,7 @@ EOF;
 
         $this->view->title      = $this->lang->ticket->browse;
         $this->view->products   = $this->loadModel('feedback')->getGrantProducts();
-        $this->view->users      = $this->loadModel('user')->getPairs('noclosed|nodeleted');
+        $this->view->users      = $this->loadModel('user')->getPairs('noclosed|nodeleted|noletter');
         $this->view->tickets    = $tickets;
         $this->view->orderBy    = $orderBy;
         $this->view->pager      = $pager;
diff --git a/module/my/css/ticket.css b/module/my/css/ticket.css
new file mode 100644
index 0000000000..f8beb12708
--- /dev/null
+++ b/module/my/css/ticket.css
@@ -0,0 +1,5 @@
+.c-pri {width: 75px}
+.c-openedDate {width: 210px}
+.c-assignedTo {width: 100px;}
+.no-wrap{text-overflow: ellipsis; white-space: nowrap; overflow: hidden;}
+
diff --git a/module/my/model.php b/module/my/model.php
index ea5a26f326..1afa242060 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -923,7 +923,7 @@ class myModel extends model
         $this->config->ticket->search['queryID']   = $queryID;
         $this->config->ticket->search['actionURL'] = $actionURL;
         $this->config->ticket->search['params']['product']['values'] = array('' => '') + $this->loadModel('feedback')->getGrantProducts();
-        $this->config->ticket->search['params']['module']['values']  = array('' => '') + $this->loadModel('tree')->getAllModulePairs('bug');
+        $this->config->ticket->search['params']['module']['values']  = array('' => '') + $this->loadModel('tree')->getAllModulePairs();
         $grantProducts = $this->loadModel('feedback')->getGrantProducts();
         $productIDlist = array_keys($grantProducts);
         $this->config->ticket->search['params']['openedBuild']['values'] = $this->loadModel('build')->getBuildPairs($productIDlist);
diff --git a/module/my/view/ticket.html.php b/module/my/view/ticket.html.php
index 29a8095532..6d0fbcb3b3 100644
--- a/module/my/view/ticket.html.php
+++ b/module/my/view/ticket.html.php
@@ -52,13 +52,13 @@
         <tr>
           <td class='text-center'><?php echo $canView ? html::a($this->createLink('ticket', 'view', "id={$ticket->id}"), $ticket->id) : $ticket->id;?></td>
           <td><?php echo zget($products, $ticket->product);?></td>
-          <td><?php echo $canView ? html::a($this->createLink('ticket', 'view', "id={$ticket->id}"), $ticket->title) : $ticket->title;?></td>
-          <td><?php echo zget($lang->ticket->priList, $ticket->pri);?></td>
+          <td class='no-wrap' title="<?php echo $ticket->title;?>"><?php echo $canView ? html::a($this->createLink('ticket', 'view', "id={$ticket->id}"), $ticket->title) : $ticket->title;?></td>
+          <td><span class='label-pri label-pri-<?php echo $ticket->pri;?>' title='<?php echo zget($lang->ticket->priList, $ticket->pri, $ticket->pri);?>'><?php echo zget($lang->ticket->priList, $ticket->pri); ?></span></td>
           <td><?php echo zget($lang->ticket->statusList, $ticket->status);?></td>
           <td><?php echo zget($lang->ticket->typeList, $ticket->type);?></td>
           <td><?php echo zget($users, $ticket->openedBy);?></td>
           <td><?php echo $ticket->openedDate;?></td>
-          <td><?php echo zget($users, $ticket->assignedTo);?></td>
+          <td><?php echo $this->ticket->printAssignedHtml($ticket, $users);?></td>
           <td class='c-actions'><?php echo $this->ticket->buildOperateBrowseMenu($ticket->id);?></td>
           </tr>
         <?php endforeach;?>