From c2db7a96a9ed6ed7aa246be54fd724e11cf3545e Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 3 Nov 2022 00:51:27 +0000
Subject: [PATCH 1/4] * Adjust devops priv.

---
 module/group/lang/resource.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 1742ff5d16..31ec5b2e59 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1929,7 +1929,22 @@ if(!$hasAssetlib or !$hasAssetlibCaselib)
     unset($lang->resource->testcase->importToLib);
 }
 
-if(!$hasOtherDevops) unset($lang->resource->repo);
+if(!$hasOtherDevops)
+{
+    unset($lang->resource->repo);
+    unset($lang->resource->svn);
+    unset($lang->resource->git);
+    unset($lang->resource->app);
+    unset($lang->resource->ci);
+    unset($lang->resource->compile);
+    unset($lang->resource->jenkins);
+    unset($lang->resource->job);
+    unset($lang->resource->gitlab);
+    unset($lang->resource->gogs);
+    unset($lang->resource->gitea);
+    unset($lang->resource->sonarqube);
+    unset($lang->resource->mr);
+}
 if(!$hasOtherKanban) unset($lang->resource->kanban);
 
 include (dirname(__FILE__) . '/changelog.php');

From 5448eaf3c7dbcff8cae219439dc01b0229f83256 Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 3 Nov 2022 01:08:39 +0000
Subject: [PATCH 2/4] * Fix bug #29110.

---
 module/common/lang/menu.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 9f038f7883..2d9d519d94 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -783,7 +783,11 @@ $hasOtherKanban     = strpos(",$config->disabledFeatures,", ',otherKanban,')
 
 if(!$config->URAndSR)    unset($lang->product->menu->requirement, $lang->product->menuOrder[35]);
 if(!$hasProductRoadmap)  unset($lang->product->menu->roadmap,     $lang->product->menuOrder[30]);
-if(!$hasProductTrack)    unset($lang->product->menu->track,       $lang->product->menuOrder[40]);
+if(!$hasProductTrack)
+{
+    unset($lang->product->menu->track, $lang->product->menuOrder[40]);
+    $lang->product->dividerMenu = str_replace(',track,', ',doc,', $lang->product->dividerMenu);
+}
 if(!$hasWaterfall)       unset($lang->admin->menu->model['dropMenu']->waterfall);
 if(!$hasAssetlibCaselib) unset($lang->qa->menu->caselib);
 

From 998866a374705ec5f08c4e0e4791fdb6b1876e97 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Thu, 3 Nov 2022 01:40:17 +0000
Subject: [PATCH 3/4]  * Finish task #74180.

---
 module/custom/control.php        |   9 ---
 module/custom/js/mode.js         |  36 +++-------
 module/custom/lang/de.php        |  18 ++---
 module/custom/lang/en.php        |  18 ++---
 module/custom/lang/fr.php        |  18 ++---
 module/custom/lang/zh-cn.php     |  18 ++---
 module/custom/model.php          |  16 -----
 module/custom/view/mode.html.php | 110 ++++++++++++++++++++++++++-----
 8 files changed, 140 insertions(+), 103 deletions(-)

diff --git a/module/custom/control.php b/module/custom/control.php
index 5d5e979dd1..259cbf1873 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -646,15 +646,6 @@ class custom extends control
 
         $this->app->loadLang('upgrade');
 
-        $this->lang->custom->changeModeContentTips['light'] = $this->lang->custom->hasMoreData['yes'];
-
-        $counts = $this->custom->getCounts();
-        foreach($counts as $function => $count)
-        {
-            if($count) unset($this->lang->custom->needClosedFunctions[$function]);
-        }
-        if(!empty($this->lang->custom->needClosedFunctions)) $this->lang->custom->changeModeContentTips['light'] = sprintf($this->lang->custom->hasMoreData['no'], implode($this->lang->comma, $this->lang->custom->needClosedFunctions));
-
         $this->view->title      = $this->lang->custom->mode;
         $this->view->position[] = $this->lang->custom->common;
         $this->view->position[] = $this->view->title;
diff --git a/module/custom/js/mode.js b/module/custom/js/mode.js
index b670ff28cc..b7834a86bf 100644
--- a/module/custom/js/mode.js
+++ b/module/custom/js/mode.js
@@ -12,36 +12,18 @@ $(function()
 
     $(document).on('click', '#submit', function()
     {
-        if(mode == $('[name=mode]:checked').val()) return false;
+        var selectedMode = $('[name=mode]:checked').val();
 
-        if($(this).hasClass('canSubmit'))
+        if(mode == selectedMode) return false;
+
+        bootbox.confirm(changeModeTips, function(result)
         {
-            $(this).removeClass('canSubmit');
-            $('#confirmModal').modal('hide');
-            return true;
-        }
-
-        $(this).addClass('canSubmit');
-
-        var $mode = $('[name=mode]:checked').val();
-        var confirmTitle   = changeModeTitleTips[$mode];
-        var confirmContent = changeModeContentTips[$mode]
-
-        $('#confirmModal .modal-title').html(confirmTitle);
-        $('#confirmModal .modal-body').html(confirmContent);
-
-        $('#confirmModal').modal('show');
+            if(result)
+            {
+                $('#modeForm').submit();
+            }
+        });
 
         return false;
     });
-
-    $(document).on('click', '.btn-confirm', function()
-    {
-        $('#submit').click();
-    });
-
-    $('#confirmModal').on('hide.zui.modal', function()
-    {
-        $('#submit').removeClass('canSubmit');
-    });
 })
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 1430b96e43..c69cb22918 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -240,17 +240,17 @@ $lang->custom->sprintConceptList[1] = 'Program Product Sprint';
 
 $lang->custom->workingList['full'] = 'Full Management of Dev';
 
-$lang->custom->menuTip        = 'Click to show/hide navigation bar. Drag to swtich display order.';
-$lang->custom->saveFail       = 'Failed to save!';
-$lang->custom->page           = ' Page';
-$lang->custom->changeModeTips = 'Historical deleted data does not participate in the data merging process. After switching the mode, it will not support restoration. Please know.';
+$lang->custom->menuTip         = 'Click to show/hide navigation bar. Drag to swtich display order.';
+$lang->custom->saveFail        = 'Failed to save!';
+$lang->custom->page            = ' Page';
+$lang->custom->currentModeTips = 'You are currently using %s, you can switch to the %s.';
+$lang->custom->changeModeTips  = 'Please double confirm to switch to %s Mode.';
 
-$lang->custom->changeModeTitleTips['ALM']   = 'Please double confirm to switch to ALM Mode.';
-$lang->custom->changeModeTitleTips['light'] = 'Please double confirm to switch to Light Mode.';
-$lang->custom->changeModeContentTips['ALM'] = 'The ALM mode is suitable for medium and large R&D teams. After switching the ALM mode, the system will enable functions such as program sets.';
+$lang->custom->modeList['light'] = 'Light Mode';
+$lang->custom->modeList['ALM']   = 'ALM Mode';
 
-$lang->custom->hasMoreData['yes'] = 'After switching to light mode, the system will close the program function, and the related functions of the program will be hidden.';
-$lang->custom->hasMoreData['no']  = 'After switching to light mode, the system will close functions such as program sets, %s.';
+$lang->custom->modeIntrodutionList['light'] = 'Light Mode suitable for small software development teams.';
+$lang->custom->modeIntrodutionList['ALM']   = 'ALM Mode suitable for medium and large software R&D teams';
 
 $lang->custom->needClosedFunctions['waterfall'] = 'Waterfall';
 $lang->custom->needClosedFunctions['URStory']   = 'User Story';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index ef36660265..6868be47f9 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -240,17 +240,17 @@ $lang->custom->sprintConceptList[1] = 'Program Product Sprint';
 
 $lang->custom->workingList['full'] = 'Application Lifecycle Management';
 
-$lang->custom->menuTip        = 'Click to show/hide the menu. Drag to switch display order.';
-$lang->custom->saveFail       = 'Failed to save!';
-$lang->custom->page           = ' Page';
-$lang->custom->changeModeTips = 'Historical deleted data does not participate in the data merging process. After switching the mode, it will not support restoration. Please know.';
+$lang->custom->menuTip         = 'Click to show/hide the menu. Drag to switch display order.';
+$lang->custom->saveFail        = 'Failed to save!';
+$lang->custom->page            = ' Page';
+$lang->custom->currentModeTips = 'You are currently using %s, you can switch to the %s.';
+$lang->custom->changeModeTips  = 'Please double confirm to switch to %s Mode.';
 
-$lang->custom->changeModeTitleTips['ALM']   = 'Please double confirm to switch to ALM Mode.';
-$lang->custom->changeModeTitleTips['light'] = 'Please double confirm to switch to Light Mode.';
-$lang->custom->changeModeContentTips['ALM'] = 'The ALM mode is suitable for medium and large R&D teams. After switching the ALM mode, the system will enable functions such as program sets.';
+$lang->custom->modeList['light'] = 'Light Mode';
+$lang->custom->modeList['ALM']   = 'ALM Mode';
 
-$lang->custom->hasMoreData['yes'] = 'After switching to light mode, the system will close the program function, and the related functions of the program will be hidden.';
-$lang->custom->hasMoreData['no']  = 'After switching to light mode, the system will close functions such as program sets, %s.';
+$lang->custom->modeIntrodutionList['light'] = 'Light Mode suitable for small software development teams.';
+$lang->custom->modeIntrodutionList['ALM']   = 'ALM Mode suitable for medium and large software R&D teams';
 
 $lang->custom->needClosedFunctions['waterfall'] = 'Waterfall';
 $lang->custom->needClosedFunctions['URStory']   = 'User Story';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 8bfa03c885..dd4af0a52b 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -240,17 +240,17 @@ $lang->custom->sprintConceptList[1] = 'Program Product Sprint';
 
 $lang->custom->workingList['full'] = 'Application Lifecycle Management';
 
-$lang->custom->menuTip        = "Cliquez pour montrer/cacher le menu. Déplacez pour changer l'ordre d'affichage.";
-$lang->custom->saveFail       = 'Echec de la sauvegarde !';
-$lang->custom->page           = ' Page';
-$lang->custom->changeModeTips = 'Historical deleted data does not participate in the data merging process. After switching the mode, it will not support restoration. Please know.';
+$lang->custom->menuTip         = "Cliquez pour montrer/cacher le menu. Déplacez pour changer l'ordre d'affichage.";
+$lang->custom->saveFail        = 'Echec de la sauvegarde !';
+$lang->custom->page            = ' Page';
+$lang->custom->currentModeTips = 'You are currently using %s, you can switch to the %s.';
+$lang->custom->changeModeTips  = 'Please double confirm to switch to %s Mode.';
 
-$lang->custom->changeModeTitleTips['ALM']   = 'Please double confirm to switch to ALM Mode.';
-$lang->custom->changeModeTitleTips['light'] = 'Please double confirm to switch to Light Mode.';
-$lang->custom->changeModeContentTips['ALM'] = 'The ALM mode is suitable for medium and large R&D teams. After switching the ALM mode, the system will enable functions such as program sets.';
+$lang->custom->modeList['light'] = 'Light Mode';
+$lang->custom->modeList['ALM']   = 'ALM Mode';
 
-$lang->custom->hasMoreData['yes'] = 'After switching to light mode, the system will close the program function, and the related functions of the program will be hidden.';
-$lang->custom->hasMoreData['no']  = 'After switching to light mode, the system will close functions such as program sets, %s.';
+$lang->custom->modeIntrodutionList['light'] = 'Light Mode suitable for small software development teams.';
+$lang->custom->modeIntrodutionList['ALM']   = 'ALM Mode suitable for medium and large software R&D teams';
 
 $lang->custom->needClosedFunctions['waterfall'] = 'Waterfall';
 $lang->custom->needClosedFunctions['URStory']   = 'User Story';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 47f924062b..bb317842b3 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -241,17 +241,17 @@ $lang->custom->sprintConceptList[1] = '项目 产品 冲刺';
 
 $lang->custom->workingList['full'] = '完整研发管理工具';
 
-$lang->custom->menuTip        = '点击显示或隐藏导航条目，拖拽来更改显示顺序。';
-$lang->custom->saveFail       = '保存失败！';
-$lang->custom->page           = '页面';
-$lang->custom->changeModeTips = '历史删除数据不参与数据归并流程，切换模式后将不支持还原，请知悉';
+$lang->custom->menuTip         = '点击显示或隐藏导航条目，拖拽来更改显示顺序。';
+$lang->custom->saveFail        = '保存失败！';
+$lang->custom->page            = '页面';
+$lang->custom->currentModeTips = '您当前使用的是%s, 您可以切换到%s';
+$lang->custom->changeModeTips  = '您确定要切换到%s吗？';
 
-$lang->custom->changeModeTitleTips['ALM']   = '您确定要切换到全生命周期管理模式吗？';
-$lang->custom->changeModeTitleTips['light'] = '您确定要切换到轻量管理模式吗？';
-$lang->custom->changeModeContentTips['ALM'] = '全生命周期管理模式适用于中大型研发团队，切换全生命周期管理模式后，系统将启用项目集等功能。';
+$lang->custom->modeList['light'] = '轻量级管理模式';
+$lang->custom->modeList['ALM']   = '全生命周期管理模式';
 
-$lang->custom->hasMoreData['yes'] = '切换到轻量管理模式后，系统将关闭项目集功能，项目集的相关功能将会被隐藏。';
-$lang->custom->hasMoreData['no']  = '切换到轻量管理模式后，系统将关闭项目集，%s等功能。';
+$lang->custom->modeIntrodutionList['light'] = '轻量级管理模式适用于小型软件研发团队';
+$lang->custom->modeIntrodutionList['ALM']   = '全生命周期管理模式适用于中大型软件研发团队';
 
 $lang->custom->needClosedFunctions['waterfall'] = '瀑布项目';
 $lang->custom->needClosedFunctions['URStory']   = '用户需求';
diff --git a/module/custom/model.php b/module/custom/model.php
index 2b17f41420..fdab377b44 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -817,22 +817,6 @@ class customModel extends model
         }
     }
 
-    /**
-     * Get waterfall, assetLib, URStory counts.
-     *
-     * @access public
-     * @return array
-     */
-    public function getCounts()
-    {
-        $counts = array();
-        $counts['waterfall'] = $this->dao->select('COUNT(*) AS waterfallCount')->from(TABLE_PROJECT)->where('model')->eq('waterfall')->andWhere('deleted')->eq('0')->fetch('waterfallCount');
-        $counts['URStory']   = $this->dao->select('COUNT(*) AS URStoryCount')->from(TABLE_STORY)->where('type')->eq('requirement')->andWhere('deleted')->eq('0')->fetch('URStoryCount');
-        if($this->config->edition == 'max') $counts['assetLib'] = $this->dao->select('COUNT(*) AS assetLibCount')->from(TABLE_ASSETLIB)->where('deleted')->eq('0')->fetch('assetLibCount');
-
-        return $counts;
-    }
-
     /**
      * process project priv within a program set.
      *
diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php
index dfb40c38ae..0f956a61b3 100644
--- a/module/custom/view/mode.html.php
+++ b/module/custom/view/mode.html.php
@@ -11,26 +11,107 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php js::set('changeModeTitleTips', $lang->custom->changeModeTitleTips);?>
-<?php js::set('changeModeContentTips', $lang->custom->changeModeContentTips);?>
+<?php js::set('changeModeTips', sprintf($lang->custom->changeModeTips, $lang->custom->modeList[$mode == 'light' ? 'ALM' : 'light']));?>
 <?php js::set('mode', $mode);?>
 <div id='mainContent' class='main-content'>
   <form id='modeForm' class="load-indicator main-form form-ajax"  method='post'>
     <div class='main-header'>
-      <div class='heading'>
-        <strong><?php echo $lang->custom->mode?></strong>
-      </div>
+      <h2><?php echo $lang->custom->mode;?></h2>
     </div>
-    <table class='table table-form'>
+    <table class='table table-form w-700px'>
       <tr>
-        <th class='text-top w-120px'><?php echo $lang->custom->mode;?></th>
-        <td class='w-300px'>
-          <p>
-            <label class="radio-inline"><input type="radio" name="mode" value="light" <?php echo $mode == 'light'? "checked='checked'" : '';?> id="modelight"><?php echo $lang->upgrade->to18Mode['light'];?></label>
-            <label class="radio-inline"><input type="radio" name="mode" value="ALM" <?php echo $mode == 'ALM'? "checked='checked'" : '';?> id="modeALM"><?php echo $lang->upgrade->to18Mode['ALM'];?></label>
-          </p>
+        <td colspan='2'><?php echo sprintf($lang->custom->currentModeTips, $lang->custom->modeList[$mode], $lang->custom->modeList[$mode == 'light' ? 'ALM' : 'light']);?> </td>
+      </tr>
+      <tr>
+        <td>
+          <label class='radio-inline'><input type='radio' name='mode' value='light' <?php echo $mode == 'light'? "checked='checked'" : '';?> id="modelight"><strong><?php echo $lang->upgrade->to18Mode['light'];?></strong></label>
+          <p class='with-padding text-muted'><?php echo $lang->custom->modeIntrodutionList['light'];?></p>
+        </td>
+        <td>
+          <label class='radio-inline'><input type='radio' name='mode' value='ALM' <?php echo $mode == 'ALM'? "checked='checked'" : '';?> id="modeALM"><strong><?php echo $lang->upgrade->to18Mode['ALM'];?></strong></label>
+          <p class='with-padding text-muted'><?php echo $lang->custom->modeIntrodutionList['ALM'];?></p>
+        </td>
+      </tr>
+      <tr>
+        <td colspan='2'>
+          <table class='table table-bordered'>
+            <thead>
+              <tr>
+                <th><?php echo $this->lang->upgrade->mode;?></th>
+                <th class="text-center"><?php echo $this->lang->upgrade->to18Mode['light'];?></th>
+                <th class="text-center"><?php echo $this->lang->upgrade->to18Mode['ALM'];?></th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td><?php echo $this->lang->upgrade->program;?></td>
+                <td class="text-center"><i class="icon text-red text-red icon-close"></i></td>
+                <td class="text-center"><i class="icon text-success text-success icon-check"></i></td>
+              </tr>
+              <tr>
+                <td><?php echo $this->lang->upgrade->productRR;?></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+              </tr>
+              <tr>
+                <td><?php echo $this->lang->upgrade->productUR;?></td>
+                <td class="text-center"><i class="icon text-red icon-close"></i></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+              </tr>
+              <tr>
+                <td><?php echo $this->lang->upgrade->productLine;?></td>
+                <td class="text-center"><i class="icon text-red icon-close"></i></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+              </tr>
+              <tr>
+                <td><?php echo $this->lang->upgrade->projectScrum;?></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+              </tr>
+              <?php if($config->edition == 'max'):?>
+              <tr>
+                <td><?php echo $this->lang->upgrade->scrumDetail;?></td>
+                <td class="text-center"><i class="icon text-red icon-close"></i></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+              </tr>
+              <?php endif;?>
+              <tr>
+                <td><?php echo $this->lang->upgrade->projectWaterfall;?></td>
+                <td class="text-center"><i class="icon text-red icon-close"></i></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+              </tr>
+              <tr>
+                <td><?php echo $this->lang->upgrade->projectKanban;?></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+              </tr>
+              <tr>
+                <td><?php echo $this->lang->upgrade->execution;?></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+              </tr>
+              <?php if($config->edition == 'max'):?>
+              <tr>
+                <td><?php echo $this->lang->upgrade->assetlib;?></td>
+                <td class="text-center"><i class="icon text-red icon-close"></i></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+              </tr>
+              <?php endif;?>
+              <?php if($config->edition == 'biz' or $config->edition == 'max'):?>
+              <tr>
+                <td><?php echo $this->lang->upgrade->oa;?></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+              </tr>
+              <?php endif;?>
+              <tr>
+                <td><?php echo $this->lang->upgrade->vision;?></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+                <td class="text-center"><i class="icon text-success icon-check"></i></td>
+              </tr>
+            </tbody>
+          </table>
         </td>
-        <td></td>
       </tr>
       <?php if($program):?>
       <tr class='hide'>
@@ -44,8 +125,7 @@
       </tr>
       <?php endif;?>
       <tr>
-        <td></td>
-        <td><?php echo html::submitButton($lang->custom->switch, 'disabled');?></td>
+        <td colspan='2'><?php echo html::submitButton($lang->custom->switch, 'disabled');?></td>
       </tr>
     </table>
   </form>

From b59ceb103815b8978c67ad159b98f278544baeaa Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 3 Nov 2022 05:28:49 +0000
Subject: [PATCH 4/4] * Finish task #72273.

---
 module/upgrade/model.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 626f885c42..11c96074ac 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -7521,6 +7521,8 @@ class upgradeModel extends model
             $project->status         = $sprint->status;
             $project->begin          = $sprint->begin;
             $project->end            = isset($sprint->end) ? $sprint->end : LONG_TIME;
+            $project->realBegan      = $sprint->realBegan;
+            $project->realEnd        = $sprint->realEnd;
             $project->days           = $this->computeDaysDelta($project->begin, $project->end);
             $project->PM             = $sprint->PM;
             $project->auth           = 'extend';