From 9358865db456fbfddf2df866b4729714108e1b05 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 23 Feb 2023 10:12:48 +0800
Subject: [PATCH] * Modify the filter label for the feedback and ticket list.

---
 module/my/control.php            |  1 +
 module/my/view/feedback.html.php | 11 ++++++++---
 module/my/view/ticket.html.php   | 13 +++++++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/module/my/control.php b/module/my/control.php
index 0ea2358b25..5343ad894e 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -1256,6 +1256,7 @@ EOF;
         $this->view->orderBy    = $orderBy;
         $this->view->pager      = $pager;
         $this->view->browseType = $browseType;
+        $this->view->mode       = 'ticket';
         $this->display();
     }
 
diff --git a/module/my/view/feedback.html.php b/module/my/view/feedback.html.php
index 5ed3ab3b5f..983309a3ed 100644
--- a/module/my/view/feedback.html.php
+++ b/module/my/view/feedback.html.php
@@ -22,10 +22,15 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
-    $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    echo html::a(inlink($app->rawMethod, "mode=$mode&type=assigntome"), "<span class='text'>{$lang->my->taskMenu->assignedToMe}</span>"   . ($browseType == 'assigntome' ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($browseType == 'assigntome' ? ' btn-active-text' : '') . "'");
+    foreach($lang->my->featureBar[$app->rawMethod]['feedback'] as $key => $name)
+    {
+        $label  = "<span class='text'>{$name}</span>";
+        $label .= $key == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
+        $active = $key == $browseType ? 'btn-active-text' : '';
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=$key"), $label, '', "class='btn btn-link $active'");
+    }
     ?>
-  <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
+    <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
   </div>
 </div>
 <div id="mainContent">
diff --git a/module/my/view/ticket.html.php b/module/my/view/ticket.html.php
index 4c8395ded1..91e5a6d1ee 100644
--- a/module/my/view/ticket.html.php
+++ b/module/my/view/ticket.html.php
@@ -11,15 +11,20 @@
  */
 ?>
 <?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
-<?php js::set('mode', 'ticket');?>
+<?php js::set('mode', $mode);?>
 <?php js::set('rawMethod', $app->rawMethod);?>
 <div id='mainMenu' class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
-    $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    echo html::a(inlink($app->rawMethod, "mode=ticket&type=assignedtome"), "<span class='text'>{$lang->my->taskMenu->assignedToMe}</span>"   . ($browseType == 'assignedtome' ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($browseType == 'assignedtome' ? ' btn-active-text' : '') . "'");
+    foreach($lang->my->featureBar[$app->rawMethod]['ticket'] as $key => $name)
+    {
+        $label  = "<span class='text'>{$name}</span>";
+        $label .= $key == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
+        $active = $key == $browseType ? 'btn-active-text' : '';
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=$key"), $label, '', "class='btn btn-link $active'");
+    }
     ?>
-  <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
+    <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
   </div>
 </div>
 <div id='mainContent' class="main-row fade">