* Add the new version.

2022-07-27 15:01:41 +08:00
parent 69ee2ea498
commit 9bfb42cffd
20 changed files with 4056 additions and 14 deletions
@@ -1 +1 @@
-17.3
+17.4
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
 if(!function_exists('getWebRoot')){function getWebRoot(){}}

 /* 基本设置。Basic settings. */
-$config->version       = '17.3';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version       = '17.4';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
 $config->liteVersion   = '1.2';                // 迅捷版版本。      The version of Lite.
 $config->charset       = 'UTF-8';              // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
 $config->cookieLife    = time() + 2592000;     // Cookie的生存时间。The cookie life time.
@@ -1,3 +1,96 @@
+2022-07-27 17.4
+完成的需求
+开源版：
+25633 项目集可以按照状态进行检索
+30848 通用看板团队成员可以从系统通讯录中添加
+32326 地盘最新动态区块中过滤掉当前用户无权访问的动态
+32327 组织动态列表中过滤掉当前用户无权访问的动态
+32331 计划的需求列表打开需求后返回列表时，保持列表排序
+32679 添加待办页面增加指派给操作
+33311 Bug关联相关Bug后可以实现互相关联
+33316 软件需求详情的相关信息中增加相关版本信息
+33317 软件需求详情的相关信息中增加相关发布信息
+33594 地盘项目统计区块的排序规则和项目集列表保持一致
+34037 调整文档中富文本和Markdown类型文档的创建流程
+34136 详情页点击撤销评审后保留在该页面局部刷新
+34172 全局设置中增加是否启用代号的设置功能
+34282 调整文档全局创建流程第一步
+34285 调整文档全局创建流程第二步
+34292 文档编辑默认进入创建页面
+34486 开启或关闭代号功能后项目集的代号信息处理规则
+34487 开启或关闭代号功能后产品的代号信息处理规则
+34488 开启或关闭代号功能后项目的代号信息处理规则
+34489 开启或关闭代号功能后执行的代号信息处理规则
+34577 已删除的项目集、产品、项目、执行不参与是否同名和同代号的判断
+34732 专业研发看板项目二级导航中打印设置菜单
+34733 打印专业研发看板项目设置功能的三级导航菜单
+34734 实现专业研发看板项目的白名单页面及功能
+34735 实现专业研发看板项目的产品页面及功能
+34736 实现专业研发看板项目的团队页面及功能
+34737 专业研发看板二级导航中打印设置菜单
+34738 打印看板设置功能的三级导航菜单
+34739 实现专业研发看板的概况页面及功能
+34740 实现专业研发看板的产品页面及功能
+34741 实现专业研发看板的团队页面及功能
+34806 计划的Bug列表打开Bug后返回列表时，保持列表排序
+34888 权限成员维护页面支持长按鼠标拖动后批量勾选功能
+34923 在权限维护页面点击保存后继续保留在当前页面
+35191 任务提交页面中，测试任务类型的多选文案显示完整
+35205 实现专业研发看板的白名单页面及功能
+35305 搜索展开保存条件时，保存搜索条件按钮左移
+34618 调用API浏览Gitea合并请求列表
+34619 调用API浏览Gitea合并请求概述
+34620 调用API查看Gitea合并请求中的代码改动
+34633 Gitea合并请求可以关联禅道的需求、任务以及Bug
+34634 调用API创建Gitea合并请求
+34635 调用API删除Gitea合并请求
+34636 调用API实现Gitea合并请求的评审
+34637 Gitea合并请求合并后调用API删除源分支
+34638 调用API实现Gitea合并请求的合并
+35241 在合并请求列表显示创建时间
+35249 合并请求概况页面显示历史记录
+35251 实现Gitea代码库下的代码对比功能
+企业版：
+29884 执行任务导出数据的名称增加来源Bug的信息
+32192 组织菜单调整为团队、日程、日志、动态、公司
+33191 加班申请通过后，办公我的考勤列表中操作/状态列展示“已加班”
+33201 办公考勤的列表的标题字号修改为16px
+33219 办公公司考勤页面中列表表头固定
+33222 增加办公公司考勤表格的底部栏高度
+33242 反馈页的通知改为“接收邮件通知”
+33244 创建反馈时必填项校验在字段下方红字展示
+33248 办公请假页面展示逻辑优化
+33252 反馈功能的权限模块icon调整
+33254 反馈权限列表中用户数量超出列宽时用省略号示意
+33397 缩短办公节假日页面中左侧的时间目录宽度
+33421 运维服务列表页面字段过长时省略显示
+33423 运维账号页面列表为空时的快捷新建页面改为弹窗样式
+34683 增加反馈转研发需求页面中父需求的标题宽度
+34684 增大反馈转研发需求页面中反馈者的输入框宽度
+34721 组织日志页面置顶显示滚动条
+34730 固定组织日志页面日志详情的展示位置
+旗舰版：
+31845 修改项目风险列表中的挂起操作图标
+33122 修改问题列表的创建日期显示内容
+33305 项目问题列表页面优先级字段居中显示
+33511 修改资产问题库中问题列表中“优先级”为“P”
+33512 修改资产风险库列表页面“优先级”为“P”
+33514 修改资产机会库列表页面“优先级”为“P”
+33525 资产需求库需求列表页面审批字段居左显示
+33528 资产问题库问题列表页面审批字段居左显示
+33529 资产风险库风险列表页面审批字段居左显示
+33530 资产机会库机会列表页面审批字段居左显示
+33823 问题指派页面增加备注
+34097 修改执行QA不符合项详情页面中解决图标
+修复的Bug
+24009 內禅任务详情页面上一个下一个切换错误
+25389 升级时需要把项目负责人加到团队中
+25439 需求换了执行对应的用例无法关联测试单
+22844 项目中创建或者编辑会议页面关联迭代后会清除之前选择的参会人员
+23200 多人任务串行，可以操作出负的消耗工时
+24357 多人任务填写日志后把日志删除对应的消耗工时仍然存在
+25185 内置报表里，执行状态的下拉框里都没有已完成
+
 2022-07-13 17.3
 完成的需求
 14130 点击按钮执行升级后禁用升级按钮
@@ -8,10 +8,10 @@ $lang->gitea->edit          = 'Edit Gitea';
 $lang->gitea->view          = 'View Gitea';
 $lang->gitea->delete        = 'Delete Gitea';
 $lang->gitea->confirmDelete = 'Do you want to delete this Gitea server?';
-$lang->gitea->giteaAvatar   = 'Avatar';
 $lang->gitea->bindUser      = 'Bind User';
-$lang->gitea->giteaEmail    = 'Email';
+$lang->gitea->giteaAvatar   = 'Avatar';
 $lang->gitea->giteaAccount  = 'Gitea Account';
+$lang->gitea->giteaEmail    = 'Email';
 $lang->gitea->zentaoAccount = 'Zentao Account';
 $lang->gitea->bindingStatus = 'Binding Status';
 $lang->gitea->notBind       = 'Not bind';
@@ -8,10 +8,10 @@ $lang->gitea->edit          = 'Edit Gitea';
 $lang->gitea->view          = 'View Gitea';
 $lang->gitea->delete        = 'Delete Gitea';
 $lang->gitea->confirmDelete = 'Do you want to delete this Gitea server?';
-$lang->gitea->giteaAvatar   = 'Avatar';
 $lang->gitea->bindUser      = 'Bind User';
-$lang->gitea->giteaEmail    = 'Email';
+$lang->gitea->giteaAvatar   = 'Avatar';
 $lang->gitea->giteaAccount  = 'Gitea Account';
+$lang->gitea->giteaEmail    = 'Email';
 $lang->gitea->zentaoAccount = 'Zentao Account';
 $lang->gitea->bindingStatus = 'Binding Status';
 $lang->gitea->notBind       = 'Not bind';
@@ -8,10 +8,10 @@ $lang->gitea->edit          = 'Edit Gitea';
 $lang->gitea->view          = 'View Gitea';
 $lang->gitea->delete        = 'Delete Gitea';
 $lang->gitea->confirmDelete = 'Do you want to delete this Gitea server?';
-$lang->gitea->giteaAvatar   = 'Avatar';
 $lang->gitea->bindUser      = 'Bind User';
-$lang->gitea->giteaEmail    = 'Email';
+$lang->gitea->giteaAvatar   = 'Avatar';
 $lang->gitea->giteaAccount  = 'Gitea Account';
+$lang->gitea->giteaEmail    = 'Email';
 $lang->gitea->zentaoAccount = 'Zentao Account';
 $lang->gitea->bindingStatus = 'Binding Status';
 $lang->gitea->notBind       = 'Not bind';
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme
 $lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions_en.png';

+$lang->misc->releaseDate['17.4']        = '2022-07-27';
 $lang->misc->releaseDate['17.3']        = '2022-07-13';
 $lang->misc->releaseDate['17.2']        = '2022-06-29';
 $lang->misc->releaseDate['17.1']        = '2022-06-16';
@@ -185,6 +186,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['17.4'][]       = array('title' => "Optimization of details Page visualization and jumping page logic. Improvement of Kanban function. Optimization of document creating and editing pages. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.3'][]       = array('title' => "UI optimization of the modules such as statistics and background, the use case library will synchronize the function optimization information. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.2'][]       = array('title' => "Adjust the display of agile project block; optimize the UI of programs, projects and tests; optimize the detailed experience. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.1'][]       = array('title' => "Modify the interaction problem of execution, project module. Complete customer's high priority requirements. The detail experience is optimized, fix bugs.", 'desc' => '');
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme
 $lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions_en.png';

+$lang->misc->releaseDate['17.4']        = '2022-07-27';
 $lang->misc->releaseDate['17.3']        = '2022-07-13';
 $lang->misc->releaseDate['17.2']        = '2022-06-29';
 $lang->misc->releaseDate['17.1']        = '2022-06-16';
@@ -185,6 +186,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['17.4'][]       = array('title' => "Optimization of details Page visualization and jumping page logic. Improvement of Kanban function. Optimization of document creating and editing pages. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.3'][]       = array('title' => "UI optimization of the modules such as statistics and background, the use case library will synchronize the function optimization information. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.2'][]       = array('title' => "Adjust the display of agile project block; optimize the UI of programs, projects and tests; optimize the detailed experience. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.1'][]       = array('title' => "Modify the interaction problem of execution, project module. Complete customer's high priority requirements. The detail experience is optimized, fix bugs.", 'desc' => '');
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme
 $lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions_en.png';

+$lang->misc->releaseDate['17.4']        = '2022-07-27';
 $lang->misc->releaseDate['17.3']        = '2022-07-13';
 $lang->misc->releaseDate['17.2']        = '2022-06-29';
 $lang->misc->releaseDate['17.1']        = '2022-06-16';
@@ -185,6 +186,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['17.4'][]       = array('title' => "Optimization of details Page visualization and jumping page logic. Improvement of Kanban function. Optimization of document creating and editing pages. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.3'][]       = array('title' => "UI optimization of the modules such as statistics and background, the use case library will synchronize the function optimization information. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.2'][]       = array('title' => "Adjust the display of agile project block; optimize the UI of programs, projects and tests; optimize the detailed experience. Fix bugs.", 'desc' => '');
 $lang->misc->feature->all['17.1'][]       = array('title' => "Modify the interaction problem of execution, project module. Complete customer's high priority requirements. The detail experience is optimized, fix bugs.", 'desc' => '');
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc      = "<p>禅道15系列上线了全新的“
 $lang->misc->feature->visionsDesc    = "<p>从16.5开始增加了界面概念，用户可以在<span style='color:#0c60e1'>[研发综合界面]</span>中处理研发事务、在<span style='color:#0c60e1'>[迅捷界面]</span>处理日常办公事务。</p><p>在头像右侧即可查看当前所处界面，点击当前界面名称可查看和切换其他的界面。</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions.png';

+$lang->misc->releaseDate['17.4']        = '2022-07-27';
 $lang->misc->releaseDate['17.3']        = '2022-07-13';
 $lang->misc->releaseDate['17.2']        = '2022-06-29';
 $lang->misc->releaseDate['17.1']        = '2022-06-16';
@@ -185,6 +186,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['17.4'][]       = array('title' => '详情页面的视觉优化和部分页面跳转逻辑优化。看板功能完善。文档创建和编辑页面优化。修复Bug。', 'desc' => '');
 $lang->misc->feature->all['17.3'][]       = array('title' => '统计、后台等模块的UI优化，用例库同步用例信息功能优化。修复Bug。', 'desc' => '');
 $lang->misc->feature->all['17.2'][]       = array('title' => '调整敏捷项目区块的展示，项目集、项目和测试相关UI优化，细节体验优化。修复Bug。', 'desc' => '');
 $lang->misc->feature->all['17.1'][]       = array('title' => '修改执行、项目模块的交互问题，完成客户巴高优先级需求，细节体验优化。修复Bug。', 'desc' => '');
@@ -114,7 +114,6 @@ $lang->program->accessDenied       = '你无权访问该项目集';
 $lang->program->beyondParentBudget = '已超出所属项目集的剩余预算';
 $lang->program->checkedProjects    = '已选择%s项';

-
 $lang->program->endList[31]  = '一个月';
 $lang->program->endList[93]  = '三个月';
 $lang->program->endList[186] = '半年';
@@ -246,9 +246,9 @@ $lang->story->legendProjectAndTask = $lang->executionCommon . ' Aufgaben';
 $lang->story->legendBugs           = 'Verküpfte Bugs';
 $lang->story->legendFromBug        = 'Verküpfte Formular Bugs';
 $lang->story->legendCases          = 'Verküpfte Fälle';
-$lang->story->legendLinkStories    = 'Verküpfte Storys';
 $lang->story->legendBuilds         = 'Verkü pfte Builds';
 $lang->story->legendReleases       = 'Verkü pfte Releases';
+$lang->story->legendLinkStories    = 'Verküpfte Storys';
 $lang->story->legendChildStories   = 'Story auteien';
 $lang->story->legendSpec           = 'Beschreibung';
 $lang->story->legendVerify         = 'Akzeptanz';
@@ -246,9 +246,9 @@ $lang->story->legendProjectAndTask = $lang->executionCommon . ' And Task';
 $lang->story->legendBugs           = 'Linked Bugs';
 $lang->story->legendFromBug        = 'From Bug';
 $lang->story->legendCases          = 'Linked Cases';
-$lang->story->legendLinkStories    = 'Linked Stories';
 $lang->story->legendBuilds         = 'Linked Builds';
 $lang->story->legendReleases       = 'Linked Releases';
+$lang->story->legendLinkStories    = 'Linked Stories';
 $lang->story->legendChildStories   = 'Child Stories';
 $lang->story->legendSpec           = 'Description';
 $lang->story->legendVerify         = 'Acceptance';
@@ -215,6 +215,7 @@ $lang->task->legendDetail = 'Task Detail';
 $lang->task->legendMisc   = 'Misc.';

 $lang->task->confirmDelete             = "Möchten Sie diese Aufgabe löschen?";
+$lang->task->confirmDeleteEstimate     = "Do you want to delete it?";
 $lang->task->confirmDeleteLastEstimate = "Do you want to delete the log? After deleting the last work log, the task status will be adjusted to Not Started.";
 $lang->task->copyStoryTitle            = "Story kopieren";
 $lang->task->afterSubmit               = "Nach der Erstellung,";
@@ -21,6 +21,7 @@ $config->upgrade->maxVersion['max3_1']       = '17_0';
 $config->upgrade->maxVersion['max3_2']       = '17_1';
 $config->upgrade->maxVersion['max3_3']       = '17_2';
 $config->upgrade->maxVersion['max3_4']       = '17_3';
+$config->upgrade->maxVersion['max3_5']       = '17_4';

 $config->upgrade->bizVersion = array();
 $config->upgrade->bizVersion['biz1_0']       = '9_5_1';
@@ -80,6 +81,7 @@ $config->upgrade->bizVersion['biz7_0']       = '17_0';
 $config->upgrade->bizVersion['biz7_1']       = '17_1';
 $config->upgrade->bizVersion['biz7_2']       = '17_2';
 $config->upgrade->bizVersion['biz7_3']       = '17_3';
+$config->upgrade->bizVersion['biz7_4']       = '17_4';

 $config->upgrade->proVersion = array();
 $config->upgrade->proVersion['pro1_0']        = '3_1';
@@ -162,6 +162,7 @@ $lang->upgrade->fromVersions['17_0']       = '17.0';
 $lang->upgrade->fromVersions['17_1']       = '17.1';
 $lang->upgrade->fromVersions['17_2']       = '17.2';
 $lang->upgrade->fromVersions['17_3']       = '17.3';
+$lang->upgrade->fromVersions['17_4']       = '17.4';

 global $config;
 /* Lite. */
@@ -328,6 +329,7 @@ $lang->upgrade->fromVersions['biz7_0']       = 'Biz7.0';
 $lang->upgrade->fromVersions['biz7_1']       = 'Biz7.1';
 $lang->upgrade->fromVersions['biz7_2']       = 'Biz7.2';
 $lang->upgrade->fromVersions['biz7_3']       = 'Biz7.3';
+$lang->upgrade->fromVersions['biz7_4']       = 'Biz7.4';

 /* Max. */
 $lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -350,3 +352,4 @@ $lang->upgrade->fromVersions['max3_1_beta2'] = 'Max3.1.beta2';
 $lang->upgrade->fromVersions['max3_1']       = 'Max3.1';
 $lang->upgrade->fromVersions['max3_2']       = 'Max3.2';
 $lang->upgrade->fromVersions['max3_3']       = 'Max3.3';
+$lang->upgrade->fromVersions['max3_4']       = 'Max3.4';
@@ -528,6 +528,8 @@ class upgradeModel extends model
                $this->moveProjectAdmins();
                $this->addStoryViewPriv();
                break;
+            case '17_3':
+                $this->processBugLinkBug();
        }

        $this->deletePatch();
@@ -975,7 +977,9 @@ class upgradeModel extends model
            case '17_2':
                $confirmContent .= file_get_contents($this->getUpgradeFile('17.2'));
            case '17_3':
-                $this->processBugLinkBug();
+                $confirmContent .= file_get_contents($this->getUpgradeFile('17.3'));
+                $xuanxuanSql     = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan6.0.1.sql';
+                $confirmContent .= file_get_contents($xuanxuanSql);
        }

        return $confirmContent;
@@ -1 +1 @@
-v6.0.1-zentaofix
+v6.1.0-rc.5
@@ -1 +1 @@
-6.0
+6.1
@@ -1 +1 @@
 .3
 .4
@@ -1 +1 @@
 .0
 .1