From fb546c117693f348bafbf53f2cf55cf5903a647d Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 28 Oct 2022 15:17:08 +0800
Subject: [PATCH] * Fix bug #29035.

---
 module/block/lang/de.php                      | 32 ++++-----
 module/block/lang/en.php                      |  6 +-
 module/block/lang/fr.php                      | 22 +++---
 .../block/view/printassigntomeblock.html.php  | 68 +++++++++++++++++--
 4 files changed, 94 insertions(+), 34 deletions(-)

diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 726b7c99c9..84132ac24f 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -342,23 +342,23 @@ $lang->block->type    = 'Type';
 $lang->block->orderBy = 'Order by';
 
 $lang->block->availableBlocks              = new stdclass();
-$lang->block->availableBlocks->todo        = 'Meine Zeitplan';
-$lang->block->availableBlocks->task        = 'Meine Aufgaben';
-$lang->block->availableBlocks->bug         = 'Meine Bugs';
-$lang->block->availableBlocks->case        = 'Meine Fälle';
-$lang->block->availableBlocks->story       = 'Meine Story';
+$lang->block->availableBlocks->todo        = 'Schedule';
+$lang->block->availableBlocks->task        = 'Tasks';
+$lang->block->availableBlocks->bug         = 'Bugs';
+$lang->block->availableBlocks->case        = 'Cases';
+$lang->block->availableBlocks->story       = 'Stories';
 $lang->block->availableBlocks->requirement = 'Requirements';
-$lang->block->availableBlocks->product     = $lang->productCommon . 'Liste';
-$lang->block->availableBlocks->execution   = $lang->executionCommon . 'Liste';
-$lang->block->availableBlocks->plan        = 'Plan';
-$lang->block->availableBlocks->release     = 'Release';
-$lang->block->availableBlocks->build       = 'Build';
-$lang->block->availableBlocks->testtask    = 'Testaufgaben';
-$lang->block->availableBlocks->risk        = 'My Risks';
-$lang->block->availableBlocks->issue       = 'My Issues';
-$lang->block->availableBlocks->meeting     = 'My Meetings';
-$lang->block->availableBlocks->feedback    = 'My Feedbacks';
-$lang->block->availableBlocks->ticket      = 'Ticket';
+$lang->block->availableBlocks->product     = $lang->productCommon . 's';
+$lang->block->availableBlocks->execution   = $lang->executionCommon . 's';
+$lang->block->availableBlocks->plan        = 'Plans';
+$lang->block->availableBlocks->release     = 'Releases';
+$lang->block->availableBlocks->build       = 'Builds';
+$lang->block->availableBlocks->testtask    = 'Requests';
+$lang->block->availableBlocks->risk        = 'Risks';
+$lang->block->availableBlocks->issue       = 'Issues';
+$lang->block->availableBlocks->meeting     = 'Meetings';
+$lang->block->availableBlocks->feedback    = 'Feedbacks';
+$lang->block->availableBlocks->ticket      = 'Tickets';
 
 if($config->systemMode == 'new') $lang->block->moduleList['project'] = 'Project';
 $lang->block->moduleList['product']   = $lang->productCommon;
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index d66fa5ed2b..22914c0b40 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -342,7 +342,7 @@ $lang->block->type    = 'Type';
 $lang->block->orderBy = 'Order by';
 
 $lang->block->availableBlocks              = new stdclass();
-$lang->block->availableBlocks->todo        = 'schedule';
+$lang->block->availableBlocks->todo        = 'Schedule';
 $lang->block->availableBlocks->task        = 'Tasks';
 $lang->block->availableBlocks->bug         = 'Bugs';
 $lang->block->availableBlocks->case        = 'Cases';
@@ -357,8 +357,8 @@ $lang->block->availableBlocks->testtask    = 'Requests';
 $lang->block->availableBlocks->risk        = 'Risks';
 $lang->block->availableBlocks->issue       = 'Issues';
 $lang->block->availableBlocks->meeting     = 'Meetings';
-$lang->block->availableBlocks->feedback    = 'My Feedbacks';
-$lang->block->availableBlocks->ticket      = 'Ticket';
+$lang->block->availableBlocks->feedback    = 'Feedbacks';
+$lang->block->availableBlocks->ticket      = 'Tickets';
 
 if($config->systemMode == 'new') $lang->block->moduleList['project'] = 'Project';
 $lang->block->moduleList['product']   = $lang->productCommon;
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index a4dc550dc7..081a42fe02 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -342,23 +342,23 @@ $lang->block->type    = 'Type';
 $lang->block->orderBy = 'Trié par';
 
 $lang->block->availableBlocks              = new stdclass();
-$lang->block->availableBlocks->todo        = 'Mon emploi du temps';
-$lang->block->availableBlocks->task        = 'Mes Tâches';
-$lang->block->availableBlocks->bug         = 'Mes Bugs';
-$lang->block->availableBlocks->case        = 'Mes CasTests';
-$lang->block->availableBlocks->story       = 'Mes Stories';
+$lang->block->availableBlocks->todo        = 'Schedule';
+$lang->block->availableBlocks->task        = 'Tasks';
+$lang->block->availableBlocks->bug         = 'Bugs';
+$lang->block->availableBlocks->case        = 'Cases';
+$lang->block->availableBlocks->story       = 'Stories';
 $lang->block->availableBlocks->requirement = 'Requirements';
 $lang->block->availableBlocks->product     = $lang->productCommon . 's';
 $lang->block->availableBlocks->execution   = $lang->executionCommon . 's';
 $lang->block->availableBlocks->plan        = 'Plans';
 $lang->block->availableBlocks->release     = 'Releases';
 $lang->block->availableBlocks->build       = 'Builds';
-$lang->block->availableBlocks->testtask    = 'Recettes';
-$lang->block->availableBlocks->risk        = 'My Risks';
-$lang->block->availableBlocks->issue       = 'My Issues';
-$lang->block->availableBlocks->meeting     = 'My Meetings';
-$lang->block->availableBlocks->feedback    = 'My Feedbacks';
-$lang->block->availableBlocks->ticket      = 'Ticket';
+$lang->block->availableBlocks->testtask    = 'Requests';
+$lang->block->availableBlocks->risk        = 'Risks';
+$lang->block->availableBlocks->issue       = 'Issues';
+$lang->block->availableBlocks->meeting     = 'Meetings';
+$lang->block->availableBlocks->feedback    = 'Feedbacks';
+$lang->block->availableBlocks->ticket      = 'Tickets';
 
 if($config->systemMode == 'new') $lang->block->moduleList['project'] = 'Project';
 $lang->block->moduleList['product']   = $lang->productCommon;
diff --git a/module/block/view/printassigntomeblock.html.php b/module/block/view/printassigntomeblock.html.php
index d1df30429a..5618edbea1 100644
--- a/module/block/view/printassigntomeblock.html.php
+++ b/module/block/view/printassigntomeblock.html.php
@@ -11,19 +11,39 @@
  */
 ?>
 <style>
-#assigntomeBlock .nav > li:not(.active) > a {padding: 8px 12px; color: #838A9D;}
+#assigntomeBlock .nav > li:not(.active) > a {padding: 8px 12px; color: #838A9D; border-color: #eee;}
+#assigntomeBlock .nav > li:not(.open) > a {color: #838A9D;}
 </style>
 <div id='assigntomeBlock'>
   <ul class="nav nav-secondary">
-    <?php $isFirstTab = true; ?>
+    <?php $isFirstTab = true;?>
+    <?php $printMore  = false;?>
+    <?php $i          = 0;?>
     <?php foreach($hasViewPriv as $type => $bool):?>
+    <?php if(!common::checkNotCN() or $i <= 6):?>
     <li<?php if($isFirstTab) {echo ' class="active"';}?>>
         <a data-tab href='#assigntomeTab-<?php echo $type;?>' onClick="changeLabel('<?php echo $type;?>')">
         <?php echo $lang->block->availableBlocks->$type;?>
         <span class='label label-light label-badge label-assignto <?php echo $type . "-count "; echo $isFirstTab ? '' : 'hidden'; $isFirstTab = false ?>'><?php echo $count[$type];?></span>
       </a>
     </li>
+    <?php else:?>
+    <?php if(!$printMore):?>
+    <?php $printMore = true;?>
+    <li>
+      <a class="dropdown-toggle moreBtn" data-toggle="dropdown" onClick="changeLabel('more')"><?php echo $lang->more;?><span class="caret"></span></a>
+        <ul class="dropdown-menu">
+    <?php endif;?>
+          <li<?php if($isFirstTab) {echo ' class="active"';}?>>
+            <a data-tab href='#assigntomeTab-<?php echo $type;?>' class='<?php echo "$type"?>' onClick="changeMoreBtn('<?php echo $type;?>', this);">
+              <?php echo $lang->block->availableBlocks->$type;?>
+              <span class='label label-light label-badge label-assignto <?php echo $type . "-count "; echo $isFirstTab ? '' : 'hidden'; $isFirstTab = false ?>'><?php echo $count[$type];?></span>
+            </a>
+          </li>
+    <?php endif;?>
+    <?php $i ++;?>
     <?php endforeach;?>
+    <?php if($printMore) echo '</ul></li>';?>
   </ul>
   <div class="tab-content">
     <?php $isFirstTab = true; ?>
@@ -41,10 +61,50 @@
 #assigntomeBlock .block-todoes .todoes-form{top: -50px;}
 </style>
 <script>
+/**
+ * Change label.
+ *
+ * @param  string type
+ * @access public
+ * @return void
+ */
 function changeLabel(type)
 {
-  $('.label-assignto').addClass('hidden');
-  $('.' + type + '-count').removeClass('hidden');
+    var $moreBtn  = $('#assigntomeBlock .moreBtn');
+    if($moreBtn.length > 0 && type != 'more')
+    {
+        $moreBtn.html("<?php echo $lang->more;?>" + "<span class='caret'></span>");
+    }
+
+    if(type != 'more')
+    {
+        $('.label-assignto').addClass('hidden');
+        $('.' + type + '-count').removeClass('hidden');
+    }
 }
+
+/**
+ * Change more button.
+ *
+ * @param string type
+ * @param object label
+ * @access public
+ * @return void
+ */
+function changeMoreBtn(type, label)
+{
+    $('.label-assignto').addClass('hidden');
+    $('.' + type + '-count').removeClass('hidden');
+
+    var $moreBtn = $('#assigntomeBlock .moreBtn');
+    var text     = $(label).html();
+    $moreBtn.html(text);
+
+    setTimeout(function()
+    {
+        $moreBtn.parent().addClass('active');
+    }, 100);
+}
+
 $('#assigntomeBlock').closest('.panel').attr('data-fixed', 'main');
 </script>