From 0c8a2982306974e6d0255ad32cb3879acf2e1724 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 30 Mar 2021 13:31:46 +0800
Subject: [PATCH]  * Finish task #37028.

---
 module/block/js/admin.js    | 43 ++++++++++++++++++++++++++++---------
 module/block/lang/de.php    | 13 +++++++----
 module/block/lang/en.php    | 13 +++++++----
 module/block/lang/fr.php    | 13 +++++++----
 module/block/lang/vi.php    | 13 +++++++----
 module/block/lang/zh-cn.php |  9 ++++----
 module/block/lang/zh-tw.php | 13 +++++++----
 7 files changed, 83 insertions(+), 34 deletions(-)

diff --git a/module/block/js/admin.js b/module/block/js/admin.js
index c524fb8e53..6199a79d67 100644
--- a/module/block/js/admin.js
+++ b/module/block/js/admin.js
@@ -9,18 +9,34 @@ $(function()
         var title = $titleInput.val();
         var value = $(this).find('option:selected').text();
 
-        var lang = config.clientLang;
-        if(lang.indexOf('zh') >= 0)
+        if($blocksList.find('#moduleBlock').val() == 'scrumtest' && $('#paramstype').val() != 'all')
         {
-            if(blockTitle.indexOf(preValue) >= 0) blockTitle = blockTitle.replace(preValue, value);
-            if(blockTitle.indexOf(preValue) < 0)  blockTitle = value + of + blockTitle;;
-            $titleInput.val(blockTitle);
+            console.log($('#paramstype').val());
+            $titleInput.val(value);
         }
         else
         {
-            var preIndex = blockTitle.indexOf(of + preValue);
-            if(preIndex >= 0) blockTitle = blockTitle.substring(0, preIndex);
-            $titleInput.val(blockTitle + of + value);
+            var lang = config.clientLang;
+            if(lang.indexOf('zh') >= 0)
+            {
+                console.log(preValue, blockTitle);
+                console.log(blockTitle.indexOf(preValue));
+                if(blockTitle.indexOf(preValue) >= 0)
+                {
+                    blockTitle = blockTitle.replace(preValue, value);
+                }
+                else
+                {
+                    if(blockTitle.indexOf(preValue) < 0)  blockTitle = value + of + title;;
+                }
+                $titleInput.val(blockTitle);
+            }
+            else
+            {
+                var preIndex = blockTitle.indexOf(of + preValue);
+                if(preIndex >= 0) blockTitle = blockTitle.substring(0, preIndex);
+                $titleInput.val(blockTitle + of + value);
+            }
         }
 
         preValue = value;
@@ -52,8 +68,15 @@ $(function()
             var preIndex = blockTitle.indexOf(' - ' + preValue);
             if(preIndex >= 0) blockTitle = blockTitle.substring(0, preIndex);
 
-            var lang = config.clientLang;
-            if(!title && blockTitle.indexOf(of) < 0) lang.indexOf('zh') >= 0 ? $titleInput.val(preValue + of + blockTitle) : $titleInput.val(blockTitle + of + preValue);
+            if($blocksList.find('#moduleBlock').val() == 'scrumtest')
+            {
+                $titleInput.val(preValue);
+            }
+            else
+            {
+                var lang = config.clientLang;
+                if(!title && blockTitle.indexOf(of) < 0) lang.indexOf('zh') >= 0 ? $titleInput.val(preValue + of + blockTitle) : $titleInput.val(blockTitle + of + preValue);
+            }
         }
     };
 
diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 5421cbe28b..7b37d26923 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -148,6 +148,10 @@ $lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon
 $lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['project']['2']['grid']  = 8;
 
+$lang->block->default['scrum']['project']['2']['params']['type']    = 'undone';
+$lang->block->default['scrum']['project']['2']['params']['count']   = '20';
+$lang->block->default['scrum']['project']['2']['params']['orderBy'] = 'id_desc';
+
 $lang->block->default['scrum']['project']['3']['title'] = 'Test Version';
 $lang->block->default['scrum']['project']['3']['block'] = 'scrumtest';
 $lang->block->default['scrum']['project']['3']['grid']  = 8;
@@ -275,10 +279,11 @@ $lang->block->default['full']['my']['3']['grid']            = 4;
 $lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = 'Project Statistic';
-$lang->block->default['full']['my']['4']['block']  = 'statistic';
-$lang->block->default['full']['my']['4']['source'] = 'project';
-$lang->block->default['full']['my']['4']['grid']   = 8;
+$lang->block->default['full']['my']['4']['title']           = 'Project Statistic';
+$lang->block->default['full']['my']['4']['block']           = 'statistic';
+$lang->block->default['full']['my']['4']['source']          = 'project';
+$lang->block->default['full']['my']['4']['grid']            = 8;
+$lang->block->default['full']['my']['4']['params']['count'] = '20';
 
 $lang->block->default['full']['my']['5']['title']  = 'Personal Contribution';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index bcfdfe41fe..3e9f4c2ac3 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -148,6 +148,10 @@ $lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon
 $lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['project']['2']['grid']  = 8;
 
+$lang->block->default['scrum']['project']['2']['params']['type']    = 'undone';
+$lang->block->default['scrum']['project']['2']['params']['count']   = '20';
+$lang->block->default['scrum']['project']['2']['params']['orderBy'] = 'id_desc';
+
 $lang->block->default['scrum']['project']['3']['title'] = 'Test Version';
 $lang->block->default['scrum']['project']['3']['block'] = 'scrumtest';
 $lang->block->default['scrum']['project']['3']['grid']  = 8;
@@ -275,10 +279,11 @@ $lang->block->default['full']['my']['3']['grid']            = 4;
 $lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = 'Project Statistic';
-$lang->block->default['full']['my']['4']['block']  = 'statistic';
-$lang->block->default['full']['my']['4']['source'] = 'project';
-$lang->block->default['full']['my']['4']['grid']   = 8;
+$lang->block->default['full']['my']['4']['title']           = 'Project Statistic';
+$lang->block->default['full']['my']['4']['block']           = 'statistic';
+$lang->block->default['full']['my']['4']['source']          = 'project';
+$lang->block->default['full']['my']['4']['grid']            = 8;
+$lang->block->default['full']['my']['4']['params']['count'] = '20';
 
 $lang->block->default['full']['my']['5']['title']  = 'Personal Contribution';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index e3c3db87fa..61d9205752 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -148,6 +148,10 @@ $lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon
 $lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['project']['2']['grid']  = 8;
 
+$lang->block->default['scrum']['project']['2']['params']['type']    = 'undone';
+$lang->block->default['scrum']['project']['2']['params']['count']   = '20';
+$lang->block->default['scrum']['project']['2']['params']['orderBy'] = 'id_desc';
+
 $lang->block->default['scrum']['project']['3']['title'] = 'Test Version';
 $lang->block->default['scrum']['project']['3']['block'] = 'scrumtest';
 $lang->block->default['scrum']['project']['3']['grid']  = 8;
@@ -275,10 +279,11 @@ $lang->block->default['full']['my']['3']['grid']            = 4;
 $lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = 'Project Statistic';
-$lang->block->default['full']['my']['4']['block']  = 'statistic';
-$lang->block->default['full']['my']['4']['source'] = 'project';
-$lang->block->default['full']['my']['4']['grid']   = 8;
+$lang->block->default['full']['my']['4']['title']           = 'Project Statistic';
+$lang->block->default['full']['my']['4']['block']           = 'statistic';
+$lang->block->default['full']['my']['4']['source']          = 'project';
+$lang->block->default['full']['my']['4']['grid']            = 8;
+$lang->block->default['full']['my']['4']['params']['count'] = '20';
 
 $lang->block->default['full']['my']['5']['title']  = 'Personal Contribution';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';
diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php
index f061078dd5..90fa4d02e1 100644
--- a/module/block/lang/vi.php
+++ b/module/block/lang/vi.php
@@ -148,6 +148,10 @@ $lang->block->default['scrum']['project']['2']['title'] = 'Project List';
 $lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['project']['2']['grid']  = 8;
 
+$lang->block->default['scrum']['project']['2']['params']['type']    = 'undone';
+$lang->block->default['scrum']['project']['2']['params']['count']   = '20';
+$lang->block->default['scrum']['project']['2']['params']['orderBy'] = 'id_desc';
+
 $lang->block->default['scrum']['project']['3']['title'] = 'Test Version';
 $lang->block->default['scrum']['project']['3']['block'] = 'scrumtest';
 $lang->block->default['scrum']['project']['3']['grid']  = 8;
@@ -275,10 +279,11 @@ $lang->block->default['full']['my']['3']['grid']            = 4;
 $lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = 'Project Statistic';
-$lang->block->default['full']['my']['4']['block']  = 'statistic';
-$lang->block->default['full']['my']['4']['source'] = 'project';
-$lang->block->default['full']['my']['4']['grid']   = 8;
+$lang->block->default['full']['my']['4']['title']           = 'Project Statistic';
+$lang->block->default['full']['my']['4']['block']           = 'statistic';
+$lang->block->default['full']['my']['4']['source']          = 'project';
+$lang->block->default['full']['my']['4']['grid']            = 8;
+$lang->block->default['full']['my']['4']['params']['count'] = '20';
 
 $lang->block->default['full']['my']['5']['title']  = 'Personal Contribution';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 1a0411768a..3e64786d70 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -279,10 +279,11 @@ $lang->block->default['full']['my']['3']['grid']            = 4;
 $lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = '项目统计';
-$lang->block->default['full']['my']['4']['block']  = 'statistic';
-$lang->block->default['full']['my']['4']['source'] = 'project';
-$lang->block->default['full']['my']['4']['grid']   = 8;
+$lang->block->default['full']['my']['4']['title']           = '项目统计';
+$lang->block->default['full']['my']['4']['block']           = 'statistic';
+$lang->block->default['full']['my']['4']['source']          = 'project';
+$lang->block->default['full']['my']['4']['grid']            = 8;
+$lang->block->default['full']['my']['4']['params']['count'] = '20';
 
 $lang->block->default['full']['my']['5']['title']  = '我的贡献';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index abb6faed3c..57f33b61a6 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -148,6 +148,10 @@ $lang->block->default['scrum']['project']['2']['title'] = $lang->executionCommon
 $lang->block->default['scrum']['project']['2']['block'] = 'scrumlist';
 $lang->block->default['scrum']['project']['2']['grid']  = 8;
 
+$lang->block->default['scrum']['project']['2']['params']['type']    = 'undone';
+$lang->block->default['scrum']['project']['2']['params']['count']   = '20';
+$lang->block->default['scrum']['project']['2']['params']['orderBy'] = 'id_desc';
+
 $lang->block->default['scrum']['project']['3']['title'] = '待測版本';
 $lang->block->default['scrum']['project']['3']['block'] = 'scrumtest';
 $lang->block->default['scrum']['project']['3']['grid']  = 8;
@@ -275,10 +279,11 @@ $lang->block->default['full']['my']['3']['grid']            = 4;
 $lang->block->default['full']['my']['3']['source']          = 'todo';
 $lang->block->default['full']['my']['3']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['4']['title']  = '項目統計';
-$lang->block->default['full']['my']['4']['block']  = 'statistic';
-$lang->block->default['full']['my']['4']['source'] = 'project';
-$lang->block->default['full']['my']['4']['grid']   = 8;
+$lang->block->default['full']['my']['4']['title']           = '項目統計';
+$lang->block->default['full']['my']['4']['block']           = 'statistic';
+$lang->block->default['full']['my']['4']['source']          = 'project';
+$lang->block->default['full']['my']['4']['grid']            = 8;
+$lang->block->default['full']['my']['4']['params']['count'] = '20';
 
 $lang->block->default['full']['my']['5']['title']  = '我的貢獻';
 $lang->block->default['full']['my']['5']['block']  = 'contribute';