diff --git a/VERSION b/VERSION index 4a6e70e959..e96b59f77e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.5.1 +10.6.stable diff --git a/config/config.php b/config/config.php index 0e05416edd..9bb69f45ff 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '10.5.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '10.6'; // 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. diff --git a/db/update10.5.1.sql b/db/update10.5.1.sql index 6fe53f72cf..ea9b2d4aa9 100644 --- a/db/update10.5.1.sql +++ b/db/update10.5.1.sql @@ -1 +1,3 @@ -UPDATE `zt_story` set `stage`='closed' WHERE `closedReason`!=''; +UPDATE `zt_story` SET `stage` = 'closed' WHERE `closedReason` != ''; +UPDATE `zt_config` SET `value` = 'consumed,comment' WHERE `module` = 'task' AND `section` = 'finish' AND `key` = 'requiredFields' AND `value` LIKE '%comment%'; +DELETE FROM `zt_config` WHERE `module` = 'task' AND `section` = 'finish' AND `key` = 'requiredFields' AND `value` NOT LIKE '%comment%'; diff --git a/doc/CHANGELOG b/doc/CHANGELOG index ee6be25dd9..5ea9a9f536 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,109 @@ +2018-11-20 10.6.stable +完成的需求 +3424 测试mysql8下面的兼容性 +3416 解决bug的时候将closed帐号从指派给列表中移除 +3406 备份增加是否备份附件的开关 +3405 优化图片粘贴上传时的交互 +3402 调整集成然之页面的样式 +3401 调整二次开发左侧的模块分组 +3400 详情页面的标签页边框没有闭合 +3399 梳理各级导航菜单的分组设置 +3398 评审拒绝的需求将研发解决改为已关闭 +3397 调整产品统计区块里面的文案 +3396 突出产品线的入口 +3395 调整备份机制 +3394 调整需求的关联需求页面：表格边框，增加状态，研发阶段 +3393 测试单添加备注页面会出现两个x +3392 调整测试用例步骤编号的对齐方式 +3391 测试单列表将概况按钮放到编辑前面 +3390 测试单列表操作按钮的文字提示把版本改为测试单 +3382 需求评审的时候增加优先级和预计工时字段 +3381 判断详情页面是否有操作权限 +3380 从用例库导入的用例增加标识 +3377 调整用例库维护用例的界面 +3376 调整列表页面批量操作栏下拉菜单的交互 +3375 调整各个视图选择模块记录的cookie和排序字段的cookie生命周期 +3374 优化url地址方式文档的显示 +3372 调整文档的详情页面 +3367 文档搜索空白结果页面去掉创建文档的链接 +3364 开发数据库一致性检查的工具 +3363 调整创建对象之后的返回的页面 +3361 表格列表页面的鼠标改成手型 +3360 删除操作之后跳转需要判断是否在隐藏的iframe中 +3357 调整项目视图的菜单 +3356 批量创建任务的时候可以查看相应的需求详情 +3355 批量创建任务时动态标识已经有任务的需求 +3354 可以将某一个任务编辑成其他任务的子任务 +3353 从过期项目导入任务时相关需求也需要记录关联操作 +3352 详情页面增加创建的快捷入口 +3349 优化树状图连接线的计算 +3345 测试单详情增加概况入口 +3344 测试单编辑页面增加备注字段 +3343 已创建的文档和文档库分类可以编辑修改所属文档库 +3342 导出的文件默认以当前产品项目对象等信息命名 +3336 完善权限列表里面的文案 +3331 树状图右侧任务标题的字体调小 +3330 tab标签页底部边框两头的线没有连接上 +3329 创建计划时候的日期框不会自动隐藏 +3325 统计区块产品和项目点击选中之后增加一个访问的快捷链接 +3324 影响范围为空的时候，把下面的线加上 +3323 一级导航中组织前面增加间隔 +3320 调整抄送给字段向上弹出时的样式 +3319 调整任务和bug优先级和严重程度的选择控件 +3318 突出表单保存成功之后的提示 +3307 确定几个弹窗的尺寸，设置集中规格，小的、中等的、大的固定尺寸的弹窗大小 +3305 权限管理未显示分组名称 +3303 批量添加用户增加入职日期字段 +3302 点击id编号，可以直接进入到详情页面 +3301 任务按所属模块进行搜索时，显示的可搜索模块和左侧保持一致 +3294 项目按照计划关联需求的时候应该给用户提示 +3118 我的地盘任务列表标题增加title +3046 一键安装包的日志分开存储 +2577 控制面板更改设置后实时保存 +2406 升级一键安装包内置的adminer的版本 +2394 fedora 下rpm依赖关系检查调整 +2366 adminder自动读取my.php里面的端口号，在登录页面填写 +修复的Bug +2035 看板的分隔线需要优化 +2168 子任务如果在最底部的时候底部的边框被遮掩 +2169 延期的任务显示逻辑不对 +2172 需求变更影响范围的显示有问题 +2214 团队受限用户任务列表无法显示复选框 +2228 子任务开始后影响父任务的指派人 +2229 测试单概况弹出窗中嵌套弹出窗问题 +2230 新建项目需求类待办无法保存，7.2/7.3/10.4版本均可复现 +2233 权限分组成员维护无法把所有成员移除 +2236 批量新建任务样式问题 +2242 导入导出菜单权限问题 +2245 我的地盘bug数量统计不准确 +2256 提bug时切换产品页面不会自动刷新 +2257 任务分组视图任务数量统计不准确 +2258 测试单下创建版本保存后页面显示错误（禅道demo可重现，本地没能重现，考虑是js关闭弹窗的问题） +2259 ubuntu16.04 zbox无法解析dns +2260 禅道界面中有错别字 +2261 测试单关联用例页面下，列表简写字段没有说明 +2262 首页产品总览区块逻辑缺失 +2263 产品概况路线图链接错误 +2266 任务完成时间设置必填项后，多人任务点击完成提示完成时间必填 +2267 用例步骤分组问题 +2268 员工负载表显示非本部门的用户 +2269 升级过程中没有将数据库升级遇到的错误都显示出来 +2271 用户批量编辑页面自定义字段不能生效（批量创建也存在此问题） +2275 产品概况多平台显示array问题 +2278 项目下文档页面文档库操作按钮显示不全 +2279 燃尽图提示信息显示颜色不对 +2280 文档模块排序问题 +2282 bug列表导入图标颜色与其余的不一致 +2283 组织用户任务显示问题 +2284 产品统计区块所有项目统计不准确 +2285 项目列表区块显示数据有问题 +2286 批量指派bug菜单显示不全 +2288 计划列表中操作栏对齐方式与其余页面不一致 +2291 发布列表关联需求操作的日志页面弹窗有大面积置灰 +2292 批量添加用户自定义表单不生效 +2293 多人任务编辑后之前记录的消耗工时会清空 +2298 升级程序代码错误 + 2018-10-25 10.5.stable 完成的需求 3389 文档查看方式与产品、项目列表信息保持一致，查看后有明显查看过的颜色标记 diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php index 43c58f3900..bd3c19459f 100644 --- a/module/admin/lang/zh-tw.php +++ b/module/admin/lang/zh-tw.php @@ -59,7 +59,7 @@ $lang->admin->safe->weak = '常用弱口令'; $lang->admin->safe->reason = '類型'; $lang->admin->safe->checkWeak = '弱口令掃瞄'; $lang->admin->safe->changeWeak = '修改弱口令密碼'; -$lang->admin->safe->modifyPasswordFirstLogin = '首次登陸修改密碼'; +$lang->admin->safe->modifyPasswordFirstLogin = '首次登錄修改密碼'; $lang->admin->safe->modeList[0] = '不檢查'; $lang->admin->safe->modeList[1] = '中'; diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php index 6c4262e134..dbde84dbd3 100644 --- a/module/backup/lang/en.php +++ b/module/backup/lang/en.php @@ -1,12 +1,13 @@ backup->common = 'Backup'; -$lang->backup->index = 'Home'; -$lang->backup->history = 'History'; -$lang->backup->delete = 'Delete'; -$lang->backup->backup = 'Backup'; -$lang->backup->restore = 'Restore'; -$lang->backup->change = 'Modify expiration'; -$lang->backup->changeAB = 'Modify'; +$lang->backup->common = 'Backup'; +$lang->backup->index = 'Home'; +$lang->backup->history = 'History'; +$lang->backup->delete = 'Delete'; +$lang->backup->backup = 'Backup'; +$lang->backup->restore = 'Restore'; +$lang->backup->change = 'Modify expiration'; +$lang->backup->changeAB = 'Modify'; +$lang->backup->rmPHPHeader = 'Remove PHP header'; $lang->backup->time = 'Date'; $lang->backup->files = 'Files'; @@ -19,8 +20,11 @@ $lang->backup->settingList['nozip'] = 'Only copy file, Uncompressed'; $lang->backup->settingList['nosafe'] = 'No need to prevent downloading PHP file header.'; $lang->backup->waitting = ' In Progress. Please wait...'; -$lang->backup->confirmDelete = 'Do you want to delete the backup？'; -$lang->backup->confirmRestore = 'Do you want to restore the backup？'; +$lang->backup->progressSQL = '

SQL backup, %s has been backed up.

'; +$lang->backup->progressAttach = '

SQL backup completed.

Attachment backup, %s has been backed up.

'; +$lang->backup->progressCode = '

SQL backup completed.

Attachment backup completed.

Code backup, %s has been backed up.

'; +$lang->backup->confirmDelete = 'Do you want to delete the backup?'; +$lang->backup->confirmRestore = 'Do you want to restore the backup?'; $lang->backup->holdDays = 'Reserve last %s days of backups'; $lang->backup->restoreTip = 'Only files and databases can be restored when you click Restore. Code can be restored manually.'; diff --git a/module/backup/lang/zh-cn.php b/module/backup/lang/zh-cn.php index fc685c81c6..b72ad3e552 100644 --- a/module/backup/lang/zh-cn.php +++ b/module/backup/lang/zh-cn.php @@ -7,7 +7,7 @@ $lang->backup->backup = '备份'; $lang->backup->restore = '还原'; $lang->backup->change = '修改保留时间'; $lang->backup->changeAB = '修改'; -$lang->backup->rmPHPHeader = '去除安全语句'; +$lang->backup->rmPHPHeader = '去除安全设置'; $lang->backup->time = '备份时间'; $lang->backup->files = '备份文件'; diff --git a/module/backup/lang/zh-tw.php b/module/backup/lang/zh-tw.php index 9decfe87c6..cfaa4ea74d 100644 --- a/module/backup/lang/zh-tw.php +++ b/module/backup/lang/zh-tw.php @@ -1,28 +1,39 @@ backup->common = '備份'; -$lang->backup->index = '備份首頁'; -$lang->backup->history = '備份歷史'; -$lang->backup->delete = '刪除備份'; -$lang->backup->backup = '備份'; -$lang->backup->restore = '還原'; -$lang->backup->change = '修改保留時間'; -$lang->backup->changeAB = '修改'; +$lang->backup->common = '備份'; +$lang->backup->index = '備份首頁'; +$lang->backup->history = '備份歷史'; +$lang->backup->delete = '刪除備份'; +$lang->backup->backup = '備份'; +$lang->backup->restore = '還原'; +$lang->backup->change = '修改保留時間'; +$lang->backup->changeAB = '修改'; +$lang->backup->rmPHPHeader = '去除安全設置'; $lang->backup->time = '備份時間'; $lang->backup->files = '備份檔案'; $lang->backup->size = '大小'; -$lang->backup->waitting = '正在進行中，請稍候...'; -$lang->backup->confirmDelete = '是否刪除備份？'; -$lang->backup->confirmRestore = '是否還原該備份？'; -$lang->backup->holdDays = '備份保留最近 %s 天'; -$lang->backup->restoreTip = '還原功能只還原附件和資料庫，如果需要還原代碼，可以手動還原。'; +$lang->backup->setting = '設置'; +$lang->backup->settingDir = '備份目錄'; +$lang->backup->settingList['nofile'] = '不備份附件和代碼'; +$lang->backup->settingList['nozip'] = '只拷貝檔案，不壓縮'; +$lang->backup->settingList['nosafe'] = '不需要防下載PHP檔案頭'; + +$lang->backup->waitting = '正在進行中，請稍候...'; +$lang->backup->progressSQL = '

SQL備份中，已備份%s

'; +$lang->backup->progressAttach = '

SQL備份完成

附件備份中，已備份%s

'; +$lang->backup->progressCode = '

SQL備份完成

附件備份完成

代碼備份中，已備份%s

'; +$lang->backup->confirmDelete = '是否刪除備份？'; +$lang->backup->confirmRestore = '是否還原該備份？'; +$lang->backup->holdDays = '備份保留最近 %s 天'; +$lang->backup->restoreTip = '還原功能只還原附件和資料庫，如果需要還原代碼，可以手動還原。'; $lang->backup->success = new stdclass(); $lang->backup->success->backup = '備份成功！'; $lang->backup->success->restore = '還原成功！'; $lang->backup->error = new stdclass(); +$lang->backup->error->noCreateDir = '備份目錄不存在，也無法創建該目錄'; $lang->backup->error->noWritable = "%s 不可寫！請檢查該目錄權限，否則無法備份。"; $lang->backup->error->noDelete = "檔案 %s 無法刪除，修改權限或手工刪除。"; $lang->backup->error->restoreSQL = "資料庫還原失敗，錯誤：%s"; diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index a412596a8d..7697aceae4 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -357,7 +357,7 @@ $lang->block->typeList->product['all'] = '全部'; $lang->block->typeList->product['involved'] = '我參與的'; $lang->block->typeList->project['undone'] = '未完成'; -$lang->block->typeList->project['isdoing'] = '進行中'; +$lang->block->typeList->project['doing'] = '進行中'; $lang->block->typeList->project['all'] = '全部'; $lang->block->typeList->project['involved'] = '我參與的'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 07dbe5e84b..593b8613c1 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -174,15 +174,15 @@ $lang->bug->tplResult = "

[結果]


"; $lang->bug->tplExpect = "

[期望]


"; /* 各個欄位取值列表。*/ -$lang->bug->severityList[3] = '3'; $lang->bug->severityList[1] = '1'; $lang->bug->severityList[2] = '2'; +$lang->bug->severityList[3] = '3'; $lang->bug->severityList[4] = '4'; $lang->bug->priList[0] = ''; -$lang->bug->priList[3] = '3'; $lang->bug->priList[1] = '1'; $lang->bug->priList[2] = '2'; +$lang->bug->priList[3] = '3'; $lang->bug->priList[4] = '4'; $lang->bug->osList[''] = ''; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index e4b8c73b5a..e980dfce60 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -210,10 +210,10 @@ $lang->product->menu = new stdclass(); $lang->product->menu->story = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->menu->plan = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan'); $lang->product->menu->release = array('link' => 'Release|release|browse|productID=%s', 'subModule' => 'release'); -$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; -$lang->product->menu->doc = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); -$lang->product->menu->dynamic = 'Dynamic|product|dynamic|productID=%s'; $lang->product->menu->roadmap = 'Roadmap|product|roadmap|productID=%s'; +$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; +$lang->product->menu->dynamic = 'Dynamic|product|dynamic|productID=%s'; +$lang->product->menu->doc = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); $lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; $lang->product->menu->module = 'Module|tree|browse|productID=%s&view=story'; $lang->product->menu->view = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit'); @@ -256,9 +256,6 @@ $lang->project->subMenu->qa->bug = 'Bug|project|bug|projectID=%s'; $lang->project->subMenu->qa->build = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build'); $lang->project->subMenu->qa->testtask = array('link' => 'Test Task|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask'); -$lang->project->subMenu->action = new stdclass(); -$lang->project->subMenu->action->dynamic = 'Dynamic|project|dynamic|projectID=%s'; - $lang->project->dividerMenu = ',story,team,product,'; $lang->task = new stdclass(); diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index ea7d7bffbd..48543cc9f4 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -18,6 +18,7 @@ $lang->downArrow = '↓'; $lang->null = '空'; $lang->ellipsis = '…'; $lang->percent = '%'; +$lang->dash = '-'; $lang->zentaoPMS = '禪道'; $lang->welcome = "%s項目管理系統"; @@ -29,6 +30,7 @@ $lang->profile = '個人檔案'; $lang->changePassword = '更改密碼'; $lang->runInfo = "
時間: %s 毫秒, 內存: %s KB, 查詢: %s.
"; $lang->agreement = "已閲讀並同意《Z PUBLIC LICENSE授權協議1.2》。未經許可，不得去除、隱藏或遮掩禪道軟件的任何標誌及連結。"; +$lang->designedByAIUX = "Designed by 艾體驗"; $lang->reset = '重填'; $lang->cancel = '取消'; @@ -124,7 +126,7 @@ $lang->menu->report = '統計|report|index'; $lang->menu->company = '組織|company|index'; $lang->menu->admin = '後台|admin|index'; -$lang->dividerMenu = ',qa,'; +$lang->dividerMenu = ',qa,report,'; /* 查詢條中可以選擇的對象列表。*/ $lang->searchObjects['bug'] = 'Bug'; @@ -193,6 +195,8 @@ $lang->my->menu->changePassword = '密碼|my|changepassword'; $lang->my->menu->manageContacts = '聯繫人|my|managecontacts'; $lang->my->menu->score = '積分|my|score'; +$lang->my->dividerMenu = ',task,myProject,profile,'; + $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; @@ -206,14 +210,16 @@ $lang->product->menu = new stdclass(); $lang->product->menu->story = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->menu->plan = array('link' => '計劃|productplan|browse|productID=%s', 'subModule' => 'productplan'); $lang->product->menu->release = array('link' => '發佈|release|browse|productID=%s', 'subModule' => 'release'); -$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; -$lang->product->menu->doc = array('link' => '文檔|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); -$lang->product->menu->dynamic = '動態|product|dynamic|productID=%s'; $lang->product->menu->roadmap = '路線圖|product|roadmap|productID=%s'; +$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; +$lang->product->menu->dynamic = '動態|product|dynamic|productID=%s'; +$lang->product->menu->doc = array('link' => '文檔|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); $lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; $lang->product->menu->module = '模組|tree|browse|productID=%s&view=story'; $lang->product->menu->view = array('link' => '概況|product|view|productID=%s', 'alias' => 'edit'); +$lang->product->dividerMenu = ',plan,project,doc,'; + $lang->story = new stdclass(); $lang->productplan = new stdclass(); $lang->release = new stdclass(); @@ -228,10 +234,10 @@ $lang->release->menu = $lang->product->menu; $lang->project = new stdclass(); $lang->project->menu = new stdclass(); -$lang->project->menu->task = array('link' => '任務|project|task|projectID=%s', 'subModule' => 'task,tree'); +$lang->project->menu->task = array('link' => '任務|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'importtask,importbug'); $lang->project->menu->kanban = array('link' => '看板|project|kanban|projectID=%s'); $lang->project->menu->burn = array('link' => '燃盡圖|project|burn|projectID=%s'); -$lang->project->menu->list = array('link' => '更多|project|grouptask|projectID=%s', 'alias' => 'grouptask,importtask,importbug,tree', 'class' => 'dropdown dropdown-hover'); +$lang->project->menu->list = array('link' => '更多|project|grouptask|projectID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover'); $lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); $lang->project->menu->qa = array('link' => '測試|project|bug|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover'); $lang->project->menu->doc = array('link' => '文檔|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); @@ -250,16 +256,13 @@ $lang->project->subMenu->qa->bug = 'Bug|project|bug|projectID=%s'; $lang->project->subMenu->qa->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build'); $lang->project->subMenu->qa->testtask = array('link' => '測試單|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask'); -$lang->project->subMenu->action = new stdclass(); -$lang->project->subMenu->action->dynamic = '動態|project|dynamic|projectID=%s'; - -$lang->project->dividerMenu = ',story,doc,'; +$lang->project->dividerMenu = ',story,team,product,'; $lang->task = new stdclass(); $lang->build = new stdclass(); $lang->task->menu = $lang->project->menu; $lang->build->menu = $lang->project->menu; -$lang->build->menu->qa = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover'); +$lang->build->menu->qa = array('link' => '測試|project|build|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover'); /* QA視圖菜單設置。*/ $lang->qa = new stdclass(); @@ -365,16 +368,36 @@ $lang->user->menu = $lang->company->menu; $lang->admin = new stdclass(); $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => '首頁|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany'); -$lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension'); +$lang->admin->menu->message = array('link' => '通知|message|index', 'subModule' => 'message,mail,webhook'); $lang->admin->menu->custom = array('link' => '自定義|custom|set', 'subModule' => 'custom'); -$lang->admin->menu->message = array('link' => '消息|message|index', 'subModule' => 'message,mail,webhook'); -$lang->admin->menu->backup = array('link' => '備份|backup|index', 'subModule' => 'backup'); +$lang->admin->menu->sso = array('link' => '整合|admin|sso'); +$lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension'); +$lang->admin->menu->dev = array('link' => '二次開發|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry'); +$lang->admin->menu->data = array('link' => '數據|backup|index', 'subModule' => 'backup,action'); $lang->admin->menu->safe = array('link' => '安全|admin|safe', 'alias' => 'checkweak'); -$lang->admin->menu->cron = array('link' => '計劃任務|cron|index', 'subModule' => 'cron'); -$lang->admin->menu->trashes = array('link' => '資源回收筒|action|trash', 'subModule' => 'action'); -$lang->admin->menu->dev = array('link' => '二次開發|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor'); -$lang->admin->menu->entry = array('link' => '應用|entry|browse', 'subModule' => 'entry'); -$lang->admin->menu->sso = '然之整合|admin|sso'; +$lang->admin->menu->system = array('link' => '系統|cron|index', 'subModule' => 'cron'); + +$lang->admin->subMenu = new stdclass(); +$lang->admin->subMenu->message = new stdclass(); +$lang->admin->subMenu->message->mail = array('link' => '郵件|mail|index', 'subModule' => 'mail'); +$lang->admin->subMenu->message->webhook = array('link' => 'Webhook|webhook|browse', 'subModule' => 'webhook'); +$lang->admin->subMenu->message->setting = array('link' => '設置|message|setting', 'subModule' => 'message'); + +$lang->admin->subMenu->sso = new stdclass(); +$lang->admin->subMenu->sso->ranzhi = '然之協同|admin|sso'; + +$lang->admin->subMenu->dev = new stdclass(); +$lang->admin->subMenu->dev->api = array('link' => 'API|dev|api'); +$lang->admin->subMenu->dev->db = array('link' => '資料庫|dev|db'); +$lang->admin->subMenu->dev->editor = array('link' => '編輯器|editor|index', 'subModule' => 'editor'); +$lang->admin->subMenu->dev->entry = array('link' => '應用|entry|browse', 'subModule' => 'entry'); + +$lang->admin->subMenu->data = new stdclass(); +$lang->admin->subMenu->data->backup = array('link' => '備份|backup|index', 'subModule' => 'backup'); +$lang->admin->subMenu->data->trash = '資源回收筒|action|trash'; + +$lang->admin->subMenu->system = new stdclass(); +$lang->admin->subMenu->system->cron = array('link' => '定時|cron|index', 'subModule' => 'cron'); $lang->convert = new stdclass(); $lang->upgrade = new stdclass(); @@ -497,6 +520,8 @@ $lang->searchMore = "搜索此關鍵字的更多結果："; $lang->chooseUsersToMail = "選擇要發信通知的用戶..."; $lang->browserNotice = '你目前使用的瀏覽器可能無法得到最佳瀏覽效果，建議使用Chrome、火狐、IE9+、Opera、Safari瀏覽器。'; $lang->noticePasteImg = "可以在編輯器直接貼圖。"; +$lang->pasteImgFail = "貼圖失敗，請稍後重試。"; +$lang->pasteImgUploading = "正在上傳圖片，請稍後..."; /* 時間格式設置。*/ if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s'); diff --git a/module/dev/lang/zh-tw.php b/module/dev/lang/zh-tw.php index 1427174a0d..842b4f8f46 100644 --- a/module/dev/lang/zh-tw.php +++ b/module/dev/lang/zh-tw.php @@ -95,16 +95,19 @@ $lang->dev->tableList['webhook'] = 'WebHook'; $lang->dev->tableList['log'] = '介面日誌'; $lang->dev->tableList['message'] = '消息'; $lang->dev->tableList['notify'] = '通知'; +$lang->dev->tableList['userview'] = '可訪問權限'; $lang->dev->groupList['my'] = '我的地盤'; $lang->dev->groupList['product'] = $lang->productCommon; $lang->dev->groupList['project'] = $lang->projectCommon; $lang->dev->groupList['qa'] = '測試'; $lang->dev->groupList['doc'] = '文檔'; +$lang->dev->groupList['report'] = '統計'; $lang->dev->groupList['company'] = '組織'; -$lang->dev->groupList['admin'] = '後台'; $lang->dev->groupList['repo'] = '代碼'; $lang->dev->groupList['api'] = 'API'; -$lang->dev->groupList['system'] = '系統'; $lang->dev->groupList['message'] = '消息'; -$lang->dev->groupList['other'] = '其他模組'; + +$lang->dev->endGroupList['admin'] = '後台'; +$lang->dev->endGroupList['system'] = '系統'; +$lang->dev->endGroupList['other'] = '其他'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 26632fecb9..0a6c5dc341 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -46,6 +46,8 @@ $lang->doc->users = 'Users'; $lang->doc->item = ' Items'; $lang->doc->num = 'Docs'; $lang->doc->searchResult = 'Search Result'; +$lang->doc->fullscreen = 'Fullscreen'; +$lang->doc->retrack = 'Retrack'; $lang->doc->moduleDoc = 'By Module'; $lang->doc->searchDoc = 'Search'; @@ -59,8 +61,6 @@ $lang->doc->todayEdited = 'Update Today'; $lang->doc->pastEdited = 'Updated'; $lang->doc->myDoc = 'My Doc'; $lang->doc->myCollection = 'My Favorite'; -$lang->doc->fullscreen = 'Full Screen'; -$lang->doc->retrack = 'Retrack'; /* 方法列表。*/ $lang->doc->index = 'Doc Home'; diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php index 91fde4514c..0ec9fe534d 100644 --- a/module/doc/lang/zh-tw.php +++ b/module/doc/lang/zh-tw.php @@ -46,6 +46,8 @@ $lang->doc->users = '用戶'; $lang->doc->item = '項'; $lang->doc->num = '文檔數量'; $lang->doc->searchResult = '搜索結果'; +$lang->doc->fullscreen = '全屏'; +$lang->doc->retrack = '收起'; $lang->doc->moduleDoc = '按模組瀏覽'; $lang->doc->searchDoc = '搜索'; @@ -141,7 +143,7 @@ $lang->doc->customObjectLibs['customFiles'] = '顯示自定義文檔庫'; $lang->doc->customShowLibs = '文檔庫顯示設置'; $lang->doc->customShowLibsList['zero'] = '顯示空文檔的庫'; -$lang->doc->customShowLibsList['unclosed'] = '顯示未關閉的項目'; +$lang->doc->customShowLibsList['unclosed'] = '只顯示未關閉的項目'; $lang->doc->confirmDelete = "您確定刪除該文檔嗎？"; $lang->doc->confirmDeleteLib = "您確定刪除該文檔庫嗎？"; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 1fb0ade2cb..c871973d24 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -48,6 +48,7 @@ $lang->group->copyOptions['copyPriv'] = 'Copy Privilege'; $lang->group->copyOptions['copyUser'] = 'Copy User'; $lang->group->versions[''] = 'History'; +$lang->group->versions['10_6'] = 'ZenTao10.6'; $lang->group->versions['10_1'] = 'ZenTao10.1'; $lang->group->versions['10_0_alpha']= 'ZenTao10.0.alpha'; $lang->group->versions['9_8'] = 'ZenTao9.8'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 80d5eca4c4..98c93a1735 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1043,16 +1043,20 @@ $lang->action->methodOrder[25] = 'comment'; $lang->action->methodOrder[30] = 'editComment'; $lang->resource->backup = new stdclass(); -$lang->resource->backup->index = 'index'; -$lang->resource->backup->backup = 'backup'; -$lang->resource->backup->restore = 'restore'; -$lang->resource->backup->change = 'change'; -$lang->resource->backup->delete = 'delete'; +$lang->resource->backup->index = 'index'; +$lang->resource->backup->backup = 'backup'; +$lang->resource->backup->restore = 'restore'; +$lang->resource->backup->change = 'change'; +$lang->resource->backup->delete = 'delete'; +$lang->resource->backup->setting = 'setting'; +$lang->resource->backup->rmPHPHeader = 'rmPHPHeader'; $lang->backup->methodOrder[5] = 'index'; $lang->backup->methodOrder[10] = 'backup'; $lang->backup->methodOrder[15] = 'restore'; $lang->backup->methodOrder[20] = 'delete'; +$lang->backup->methodOrder[25] = 'setting'; +$lang->backup->methodOrder[30] = 'rmPHPHeader'; $lang->resource->cron = new stdclass(); $lang->resource->cron->index = 'index'; @@ -1395,6 +1399,9 @@ $lang->changelog['10.1'][] = 'todo-batchClose'; $lang->changelog['10.1'][] = 'project-treeTask'; $lang->changelog['10.1'][] = 'project-treeStory'; +$lang->changelog['10.6'][] = 'backup-setting'; +$lang->changelog['10.6'][] = 'backup-rmPHPHeader'; + global $config; if($config->global->flow != 'full') { diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index e05ae9c578..c10d8e07e5 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -48,6 +48,7 @@ $lang->group->copyOptions['copyPriv'] = '复制权限'; $lang->group->copyOptions['copyUser'] = '复制用户'; $lang->group->versions[''] = '修改历史'; +$lang->group->versions['10_6'] = '禅道10.6'; $lang->group->versions['10_1'] = '禅道10.1'; $lang->group->versions['10_0_alpha']= '禅道10.0.alpha'; $lang->group->versions['9_8'] = '禅道9.8'; diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php index cdf18be961..6582b93c40 100644 --- a/module/group/lang/zh-tw.php +++ b/module/group/lang/zh-tw.php @@ -48,6 +48,7 @@ $lang->group->copyOptions['copyPriv'] = '複製權限'; $lang->group->copyOptions['copyUser'] = '複製用戶'; $lang->group->versions[''] = '修改歷史'; +$lang->group->versions['10_6'] = '禪道10.6'; $lang->group->versions['10_1'] = '禪道10.1'; $lang->group->versions['10_0_alpha']= '禪道10.0.alpha'; $lang->group->versions['9_8'] = '禪道9.8'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 4de9be8665..7d2e1542a2 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -76,6 +76,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Latest Version'; $lang->misc->feature->detailed = 'Details'; +$lang->misc->releaseDate['10.6.stable'] = '2018-11-20'; $lang->misc->releaseDate['10.5.stable'] = '2018-10-25'; $lang->misc->releaseDate['10.4.stable'] = '2018-09-28'; $lang->misc->releaseDate['10.3.stable'] = '2018-08-10'; @@ -95,6 +96,9 @@ $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['10.6.stable'][] = array('title'=>'Adjust backup mechanism', 'desc' => '

Increase backup settings and make backups more flexible

Show backup progress

Can change the backup directory

'); +$lang->misc->feature->all['10.6.stable'][] = array('title'=>'Optimize and adjust menus', 'desc' => '

Adjust admin menus

Adjust the secondary menu of my and project

'); + $lang->misc->feature->all['10.5.stable'][] = array('title'=>'Adjust document display', 'desc' => "

Adjust the layout method on the left side of the document library.

Adding filter conditions to the bottom of the document library's navigation bottom.

"); $lang->misc->feature->all['10.5.stable'][] = array('title'=>'Adjust the sub task logic and optimize the display of father child task.', 'desc' => ''); diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 51b7870bf8..314baec923 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -76,6 +76,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '详情'; +$lang->misc->releaseDate['10.6.stable'] = '2018-11-20'; $lang->misc->releaseDate['10.5.stable'] = '2018-10-25'; $lang->misc->releaseDate['10.4.stable'] = '2018-09-28'; $lang->misc->releaseDate['10.3.stable'] = '2018-08-10'; @@ -95,6 +96,9 @@ $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['10.6.stable'][] = array('title'=>'调整备份机制', 'desc' => '

增加备份设置，备份更加灵活

显示备份进度

可以更改备份目录

'); +$lang->misc->feature->all['10.6.stable'][] = array('title'=>'优化和调整菜单', 'desc' => '

调整后台菜单

调整我的地盘和项目的二级菜单

'); + $lang->misc->feature->all['10.5.stable'][] = array('title'=>'调整文档显示', 'desc' => '

调整文档库左侧的布局方式

文档库左侧导航底部增加筛选条件

'); $lang->misc->feature->all['10.5.stable'][] = array('title'=>'调整子任务逻辑，优化父子任务显示。', 'desc' => ''); diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php index 52511cfafe..e25ec47b27 100644 --- a/module/misc/lang/zh-tw.php +++ b/module/misc/lang/zh-tw.php @@ -76,6 +76,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '詳情'; +$lang->misc->releaseDate['10.6.stable'] = '2018-11-20'; $lang->misc->releaseDate['10.5.stable'] = '2018-10-25'; $lang->misc->releaseDate['10.4.stable'] = '2018-09-28'; $lang->misc->releaseDate['10.3.stable'] = '2018-08-10'; @@ -95,6 +96,9 @@ $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['10.6.stable'][] = array('title'=>'調整備份機制', 'desc' => '

增加備份設置，備份更加靈活

顯示備份進度

可以更改備份目錄

'); +$lang->misc->feature->all['10.6.stable'][] = array('title'=>'優化和調整菜單', 'desc' => '

調整後台菜單

調整我的地盤和項目的二級菜單

'); + $lang->misc->feature->all['10.5.stable'][] = array('title'=>'調整文檔顯示', 'desc' => '

調整文檔庫左側的佈局方式

文檔庫左側導航底部增加篩選條件

'); $lang->misc->feature->all['10.5.stable'][] = array('title'=>'調整子任務邏輯，優化父子任務顯示。', 'desc' => ''); diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php index ca7501faf6..5de942cbcb 100644 --- a/module/product/lang/zh-tw.php +++ b/module/product/lang/zh-tw.php @@ -72,6 +72,8 @@ $lang->product->whitelist = '分組白名單'; $lang->product->branch = '所屬%s'; $lang->product->qa = '測試'; $lang->product->release = '發佈'; +$lang->product->allRelease = '所有發佈'; +$lang->product->maintain = '維護中'; $lang->product->latestDynamic = '最新動態'; $lang->product->plan = '計劃'; $lang->product->iteration = '版本迭代'; @@ -91,7 +93,7 @@ $lang->product->closedStory = '已關閉'; $lang->product->unclosed = '未關閉'; $lang->product->unplan = '未計劃'; -$lang->product->allStory = '全部需求'; +$lang->product->allStory = '所有'; $lang->product->allProduct = '全部' . $lang->productCommon; $lang->product->allProductsOfProject = '全部關聯' . $lang->productCommon; diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index ac8ae88d8a..c55b4937a0 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -60,12 +60,12 @@ $lang->project->readjustTask = '順延任務的起止時間'; $lang->project->effort = '日誌'; $lang->project->relatedMember = '相關成員'; -$lang->project->start = '開始'; -$lang->project->activate = '激活'; -$lang->project->putoff = '延期'; -$lang->project->suspend = '掛起'; -$lang->project->close = '關閉'; -$lang->project->export = '導出'; +$lang->project->start = "開始"; +$lang->project->activate = "激活"; +$lang->project->putoff = "延期"; +$lang->project->suspend = "掛起"; +$lang->project->close = "關閉"; +$lang->project->export = "導出"; $lang->project->typeList['sprint'] = "短期$lang->projectCommon"; $lang->project->typeList['waterfall'] = "長期$lang->projectCommon"; @@ -115,7 +115,7 @@ $lang->project->latestDynamic = '最新動態'; $lang->project->build = '所有版本'; $lang->project->testtask = '測試任務'; $lang->project->burn = '燃盡圖'; -$lang->project->computeBurn = '更新'; +$lang->project->computeBurn = '更新燃盡圖'; $lang->project->burnData = '燃盡圖數據'; $lang->project->fixFirst = '修改首天工時'; $lang->project->team = '團隊成員'; @@ -142,10 +142,12 @@ $lang->project->batchUnlinkStory = '批量移除需求'; $lang->project->importTask = '轉入任務'; $lang->project->importPlanStories = '按計劃關聯需求'; $lang->project->importBug = '導入Bug'; -$lang->project->updateOrder = '排序'; +$lang->project->updateOrder = "{$lang->projectCommon}排序"; $lang->project->tree = '樹狀圖'; $lang->project->treeTask = '只看任務'; $lang->project->treeStory = '只看需求'; +$lang->project->treeOnlyTask = '樹狀圖只看任務'; +$lang->project->treeOnlyStory = '樹狀圖只看需求'; $lang->project->storyKanban = '需求看板'; $lang->project->storySort = '需求排序'; $lang->project->importPlanStory = '創建' . $lang->projectCommon . '成功！\n是否導入計劃關聯的相關需求？'; @@ -190,6 +192,7 @@ $lang->project->aboveAllProduct = "以上所有{$lang->productCommon}"; $lang->project->aboveAllProject = "以上所有{$lang->projectCommon}"; /* 頁面提示。*/ +$lang->project->linkStoryByPlanTips = '此操作會將所選計划下面的需求全部關聯到此項目中'; $lang->project->selectProject = "請選擇{$lang->projectCommon}"; $lang->project->beginAndEnd = '起止時間'; $lang->project->begin = '開始日期'; diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index 861b05b2ee..f905a4c9f5 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -157,9 +157,9 @@ $lang->story->sourceList['bug'] = 'Bug'; $lang->story->sourceList['other'] = '其他'; $lang->story->priList[] = ''; -$lang->story->priList[3] = '3'; $lang->story->priList[1] = '1'; $lang->story->priList[2] = '2'; +$lang->story->priList[3] = '3'; $lang->story->priList[4] = '4'; $lang->story->legendBasicInfo = '基本信息'; diff --git a/module/story/model.php b/module/story/model.php index 9d9819d1e6..8f86e7a312 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1109,6 +1109,7 @@ class storyModel extends model ->remove('comment') ->get(); $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq($storyID)->exec(); + $this->setStage($storyID); return true; } diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index 3ef571cfba..75b8d1fee1 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -141,9 +141,9 @@ $lang->task->typeList['affair'] = '事務'; $lang->task->typeList['misc'] = '其他'; $lang->task->priList[0] = ''; -$lang->task->priList[3] = '3'; $lang->task->priList[1] = '1'; $lang->task->priList[2] = '2'; +$lang->task->priList[3] = '3'; $lang->task->priList[4] = '4'; $lang->task->reasonList[''] = ''; diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php index f5690408b0..b40c77db18 100644 --- a/module/testcase/lang/zh-tw.php +++ b/module/testcase/lang/zh-tw.php @@ -63,6 +63,7 @@ $lang->testcase->stepNumber = '用例步驟數'; $lang->testcase->stepNumberAB = 'S'; $lang->testcase->createBug = '轉Bug'; $lang->testcase->fromModule = '來源模組'; +$lang->testcase->fromCase = '來源用例'; $lang->case = $lang->testcase; // 用於DAO檢查時使用。因為case是系統關鍵字，所以無法定義該模組為case，只能使用testcase，但表還是使用的case。 $lang->testcase->stepID = '編號'; diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php index 53b278fbfd..1df3bfb1c3 100644 --- a/module/testtask/lang/zh-tw.php +++ b/module/testtask/lang/zh-tw.php @@ -14,7 +14,7 @@ $lang->testtask->create = "提交測試"; $lang->testtask->reportChart = '報表統計'; $lang->testtask->delete = "刪除版本"; $lang->testtask->view = "概況"; -$lang->testtask->edit = "編輯版本"; +$lang->testtask->edit = "編輯測試單"; $lang->testtask->browse = "版本列表"; $lang->testtask->linkCase = "關聯用例"; $lang->testtask->selectVersion = "選擇版本"; diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php index feb9ec6219..3a3283b497 100644 --- a/module/todo/lang/zh-tw.php +++ b/module/todo/lang/zh-tw.php @@ -21,7 +21,7 @@ $lang->todo->close = "關閉"; $lang->todo->batchClose = "批量關閉"; $lang->todo->batchEdit = "批量編輯"; $lang->todo->view = "待辦詳情"; -$lang->todo->finish = "完成"; +$lang->todo->finish = "完成待辦"; $lang->todo->batchFinish = "批量完成"; $lang->todo->export = "導出"; $lang->todo->delete = "刪除"; diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php index 1fe3b07f80..5bda0d3ee2 100644 --- a/module/tree/lang/zh-tw.php +++ b/module/tree/lang/zh-tw.php @@ -52,6 +52,7 @@ $lang->tree->branch = '平台/分支'; $lang->tree->path = '路徑'; $lang->tree->type = '類型'; $lang->tree->parent = '上級模組'; +$lang->tree->parentCate = '上級分類'; $lang->tree->child = '子模組'; $lang->tree->lineChild = '子產品綫'; $lang->tree->owner = '負責人'; diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index c6093fa9f5..fde3a38b45 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -98,3 +98,4 @@ $lang->upgrade->fromVersions['10_3'] = '10.3'; $lang->upgrade->fromVersions['10_3_1'] = '10.3.1'; $lang->upgrade->fromVersions['10_4'] = '10.4'; $lang->upgrade->fromVersions['10_5'] = '10.5'; +$lang->upgrade->fromVersions['10_5_1'] = '10.5.1'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 55e7db8847..b6d9fdd17a 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -17,6 +17,7 @@ $lang->upgrade->tohome = '訪問禪道'; $lang->upgrade->license = '禪道項目管理軟件已更換授權協議至 Z PUBLIC LICENSE(ZPL) 1.2'; $lang->upgrade->warnning= '警告'; $lang->upgrade->checkExtension = '檢查插件'; +$lang->upgrade->consistency = '一致性檢查'; $lang->upgrade->warnningContent = <<升級有危險，請先備份資料庫，以防萬一。

@@ -44,5 +45,6 @@ $lang->upgrade->confirm       = '確認要執行的SQL語句';
 $lang->upgrade->sureExecute   = '確認執行';
 $lang->upgrade->forbiddenExt  = '以下插件與新版本不兼容，已經自動禁用：';
 $lang->upgrade->updateFile    = '需要更新附件信息。';
+$lang->upgrade->noticeSQL     = '檢查到你的資料庫跟標準不一致，嘗試修復失敗。請執行以下SQL語句，再刷新頁面檢查。';
 
 include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 2fb2be0294..98920fe710 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -248,7 +248,7 @@ class upgradeModel extends model
                 $this->changeTaskParentValue();
             case '10_5':
             case '10_5_1':
-                $this->updateTaskRequireFields();
+                $this->execSQL($this->getUpgradeFile('10.5.1'));
         }
 
         $this->deletePatch();
@@ -366,6 +366,7 @@ class upgradeModel extends model
             case '10_3_1':     $confirmContent .= file_get_contents($this->getUpgradeFile('10.3.1'));
             case '10_4':       $confirmContent .= file_get_contents($this->getUpgradeFile('10.4'));
             case '10_5':
+            case '10_5_1':     $confirmContent .= file_get_contents($this->getUpgradeFile('10.5.1'));
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }
@@ -2543,31 +2544,4 @@ class upgradeModel extends model
         foreach($users as $user) $this->user->computeUserView($user->account, $force = true);
         return true;
     }
-
-    /**
-     * Delete finish task require field.
-     * 
-     * @access public
-     * @return bool
-     */
-    public function updateTaskRequireField()
-    {
-        $value = $this->dao->select('`value`')->from(TABLE_CONFIG)
-            ->where('`module`')->eq('task')
-            ->andWhere('`section`')->eq('finish')
-            ->andWhere('`key`')->eq('requiredFields')
-            ->fetch();
-
-        if(strpos($value->value, 'finishedDate') === false) return true;
-
-        $value = trim(str_replace(',finishedDate,', ',', ",{$value->value},"), ',');
-
-        $this->dao->update(TABLE_CONFIG)->set('`value`')->eq($value)
-            ->where('`module`')->eq('task')
-            ->andWhere('`section`')->eq('finish')
-            ->andWhere('`key`')->eq('requiredFields')
-            ->exec();
-
-        return true;
-    }
 }