Merge branch 'sprint/184_hufangzhou_newVersion' into 'master'

* Add the new version. See merge request easycorp/zentaopms!1801
2022-02-15 02:17:39 +00:00
parent af7fcb8a45 231105cb37
commit abf746ad62
10 changed files with 1661 additions and 2 deletions
@@ -1 +1 @@
-16.3
+16.4
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
 if(!function_exists('getWebRoot')){function getWebRoot(){}}

 /* 基本设置。Basic settings. */
-$config->version       = '16.3';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version       = '16.4';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
 $config->charset       = 'UTF-8';              // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
 $config->cookieLife    = time() + 2592000;     // Cookie的生存时间。The cookie life time.
 $config->timezone      = 'Asia/Shanghai';      // 时区设置。        The time zone setting, for more see http://www.php.net/manual/en/timezones.php.
@@ -1,3 +1,34 @@
+2022-02-15 16.4
+完成的需求
+30526 实现JIRA数据导入到禅道功能
+30675 优化禅道中SonarQube的扫描结果详情页面
+30583 SonarQube免登录探针需求
+30576 在禅道中当对应的GitLab项目的代码库为空时，隐藏GitLab项目下下关于分支与标签操作的按钮。
+30559 在禅道中设置GitLab项目或群组权限为公开时给予告警提示
+30558 实现GitLab群组URL可点击的功能
+30556 GitLab服务器列表中地址可点击
+30554 修改GitLab服务器列表“GitLab名称”为“GitLab服务器”
+30553 在禅道中实现创建GitLab服务器时对当前GitLab版本进行兼容性检查功能
+30552 在禅道中针对无权限用户将合并请求编辑按钮置灰
+30461 实现在禅道中将SonarQube问题转成禅道Bug的功能
+30455 实现SonarQube问题详情页面
+30453 实现SonarQube问题列表页面的搜索功能
+30451 实现SonarQube问题列表页面的返回功能
+30447 在SonarQube扫描报告概要页面添加问题详情列表的入口
+30443 实现在添加/编辑SonarQube服务器时验证填写用户是否为SonarQube管理员的功能
+30183 实现从禅道SonarQube项目列表查看SonarQube代码检查结果的入口
+29859 实现禅道中创建SonarQube项目功能
+29241 实现构建通知发送到喧喧功能
+29228 实现SonarQube项目问题列表页面
+修复的BUG
+18816 DevOps-代码中，GitLab类型的版本库代码内容未显示完全
+18382 代码页面版本列版本号显示不一致
+18380 历史记录中重复显示多条记录
+18104 VS Code COMMIT_EDITMSG文件中应只显示未选中的需求/Bug/任务
+18076 VSCode中查看项目/执行下的需求时应跳转到项目/执行下的需求详情页
+17869 VScode中查看需求、任务和Bug提示“请求后端出错”
+17851 vscode查看执行下的需求，提示先选择项目
+
 2022-01-26 16.3
 完成的需求
 29706 研发看板相关操作支持平滑刷新方式呈现
@@ -19,6 +19,7 @@ $lang->bug->module           = 'Module';
 $lang->bug->moduleAB         = 'Module';
 $lang->bug->project          = 'Project';
 $lang->bug->execution        = $lang->execution->common;
+$lang->bug->kanban           = 'Kanban';
 $lang->bug->story            = 'Story';
 $lang->bug->storyVersion     = 'Story Version';
 $lang->bug->color            = 'Color';
@@ -94,6 +94,7 @@ $lang->misc->feature->downloadFile   = 'Download introduction';
 $lang->misc->feature->tutorialDesc   = '<p>ZenTao 15.0 has new functions, and you know how to use it through the "<strong>Tutorial</strong>".</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';
 $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme, the pages are more beautiful and the experience is more friendly.</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';

+$lang->misc->releaseDate['16.4']        = '2022-02-15';
 $lang->misc->releaseDate['16.3']        = '2022-01-26';
 $lang->misc->releaseDate['16.2']        = '2022-01-17';
 $lang->misc->releaseDate['16.1']        = '2022-01-11';
@@ -167,6 +168,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';

+$lang->misc->feature->all['16.4'][]       = array('title' => 'Implement JIRA import function and improve plug-in extension mechanism.', 'desc' => '');
 $lang->misc->feature->all['16.3'][]       = array('title' => 'Kanban adds related plan/release/version/iteration functions, and the detail experience is optimized, fix bugs.', 'desc' => '');
 $lang->misc->feature->all['16.2'][]       = array('title' => 'Add kanban model project, fix bugs.', 'desc' => '');
 $lang->misc->feature->all['16.1'][]       = array('title' => 'Plan to add status management and Kanban view, upgrade process optimization, fix bugs.', 'desc' => '');
@@ -94,6 +94,7 @@ $lang->misc->feature->downloadFile   = '下载新版本功能介绍文档';
 $lang->misc->feature->tutorialDesc   = "<p>禅道15系列新增了多项功能，您可以通过“<strong>新手引导教程</strong>”快速了解禅道的基本使用方法。</p><p>通过鼠标经过 [<span style='color: #0c60e1'>头像-新手引导</span>]，点击新手引导，即可进入新手引导教程。</p>";
 $lang->misc->feature->themeDesc      = "<p>禅道15系列上线了全新的“青春蓝”主题，页面呈现更加美观，体验更加友好。</p><p>通过鼠标经过 [<span style='color: #0c60e1'>头像-主题-青春蓝</span>]，点击青春蓝，即可设置成功。</p>";

+$lang->misc->releaseDate['16.4']        = '2022-02-15';
 $lang->misc->releaseDate['16.3']        = '2022-01-26';
 $lang->misc->releaseDate['16.2']        = '2022-01-17';
 $lang->misc->releaseDate['16.1']        = '2022-01-11';
@@ -167,6 +168,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';

+$lang->misc->feature->all['16.4'][]       = array('title' => '实现JIRA导入功能，完善插件扩展机制。', 'desc' => '');
 $lang->misc->feature->all['16.3'][]       = array('title' => '看板增加关联计划/发布/版本/迭代功能，细节体验优化。', 'desc' => '');
 $lang->misc->feature->all['16.2'][]       = array('title' => '新增专业研发看板，可以创建看板模型项目，修复Bug。', 'desc' => '');
 $lang->misc->feature->all['16.1'][]       = array('title' => '计划增加状态管理和看板视图，升级流程优化，修复Bug。', 'desc' => '');
@@ -67,8 +67,10 @@ $lang->sonarqube->qualitygateList['WARN']  = 'Warning';
 $lang->sonarqube->qualitygateList['ERROR'] = 'Failed';

 $lang->sonarqube->apiErrorMap[1] = "/Malformed key for Project: '([\s\S]+)'. Allowed characters are alphanumeric, '-', '_', '\.' and ':', with at least one non-digit\./";
+$lang->sonarqube->apiErrorMap[2] = "/Could not create Project, key already exists: ([\s\S]+)/";

 $lang->sonarqube->errorLang[1] = "Malformed key for Project Key,Allowed characters are alphanumeric, '-', '_', '.' and ':', with at least one non-digit.";
+$lang->sonarqube->errorLang[2] = "Could not create Project, key already exists: %s";

 $lang->sonarqube->issue = new stdclass();
 $lang->sonarqube->issue->message      = 'Issue Name';
@@ -151,3 +151,4 @@ $lang->upgrade->fromVersions['16_0_beta1'] = '16.0.beta1';
 $lang->upgrade->fromVersions['16_0']       = '16.0';
 $lang->upgrade->fromVersions['16_1']       = '16.1';
 $lang->upgrade->fromVersions['16_2']       = '16.2';
+$lang->upgrade->fromVersions['16_3']       = '16.3';
@@ -756,6 +756,10 @@ class upgradeModel extends model
            $this->updateSpaceTeam();
            $this->updateDocField();
            $this->appendExec('16_2');
+        case '16_3':
+            $this->saveLogs('Execute 16_3');
+            $this->execSQL($this->getUpgradeFile('16.3'));
+            $this->appendExec('16_3');
        }

        $this->deletePatch();
@@ -966,6 +970,7 @@ class upgradeModel extends model
            case '16_0': $confirmContent .= file_get_contents($this->getUpgradeFile('16.0'));
            case '16_1': $confirmContent .= file_get_contents($this->getUpgradeFile('16.1'));
            case '16_2': $confirmContent .= file_get_contents($this->getUpgradeFile('16.2'));
+            case '16_3': $confirmContent .= file_get_contents($this->getUpgradeFile('16.3'));
        }
        return str_replace('zt_', $this->config->db->prefix, $confirmContent);
    }
@@ -1 +1 @@
 .3
 .4