From fa574273ac1a1ef32a1db4cb2101012271e445ea Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 2 Apr 2021 15:54:43 +0800 Subject: [PATCH 01/10] * adjust for upgrade. --- module/group/lang/resource.php | 8 -------- module/upgrade/model.php | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 0c8c4367a9..486ea74f4f 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -93,8 +93,6 @@ $lang->resource->my->story = 'story'; $lang->resource->my->task = 'task'; $lang->resource->my->bug = 'bug'; $lang->resource->my->doc = 'doc'; -$lang->resource->my->issue = 'issue'; -$lang->resource->my->risk = 'risk'; $lang->resource->my->testtask = 'testtask'; $lang->resource->my->testcase = 'testcase'; $lang->resource->my->execution = 'execution'; @@ -122,8 +120,6 @@ $lang->my->methodOrder[95] = 'testtask'; $lang->my->methodOrder[100] = 'testcase'; $lang->my->methodOrder[105] = 'execution'; $lang->my->methodOrder[110] = 'doc'; -$lang->my->methodOrder[115] = 'issue'; -$lang->my->methodOrder[120] = 'risk'; /* Todo. */ $lang->resource->todo = new stdclass(); @@ -1199,8 +1195,6 @@ $lang->resource->user->cropAvatar = 'cropAvatar'; $lang->resource->user->profile = 'profile'; $lang->resource->user->batchEdit = 'batchEdit'; $lang->resource->user->unbind = 'unbind'; -$lang->resource->user->issue = 'issue'; -$lang->resource->user->risk = 'risk'; $lang->resource->user->setPublicTemplate = 'setPublicTemplate'; $lang->user->methodOrder[5] = 'create'; @@ -1213,8 +1207,6 @@ $lang->user->methodOrder[30] = 'todo'; $lang->user->methodOrder[35] = 'task'; $lang->user->methodOrder[40] = 'bug'; $lang->user->methodOrder[45] = 'project'; -$lang->user->methodOrder[50] = 'issue'; -$lang->user->methodOrder[55] = 'risk'; $lang->user->methodOrder[60] = 'dynamic'; $lang->user->methodOrder[65] = 'cropAvatar'; $lang->user->methodOrder[70] = 'profile'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index d75330bdea..a634baef52 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -640,6 +640,7 @@ class upgradeModel extends model $this->execSQL($this->getUpgradeFile('15.0')); $this->adjustWhitelistOfProject(); $this->adjustWhitelistOfProduct(); + $this->adjustPriv15_0(); $this->appendExec('15_0'); } From 24a37ce4c302cc85b779a04e639048ccc3b71f4a Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Fri, 2 Apr 2021 16:13:18 +0800 Subject: [PATCH 02/10] * Fix a bug. --- module/product/view/browse.html.php | 2 +- module/story/control.php | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 14217ea5f6..07f84b5b8c 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -143,7 +143,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
- createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=0$extraParam"), " {$lang->story->create}", '', "class='btn $buttonType' data-app='$openApp'");?> + createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID={$this->session->project}$extraParam"), " {$lang->story->create}", '', "class='btn $buttonType' data-app='$openApp'");?>
id", " " . $lang->story->export, '', "class='btn btn-link export' data-app='execution'"); + common::printLink('story', 'export', "productID=$productID&orderBy=id_desc&executionID=$execution->id", " " . $lang->story->export, '', "class='btn btn-link export iframe' data-app='execution'"); if(common::canModify('execution', $execution)) { From ad614bf635d5388a2f58e4d6d16e72d9edc46b11 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 2 Apr 2021 16:28:26 +0800 Subject: [PATCH 04/10] * Fix recent block. --- module/block/view/recentprojectblock.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/block/view/recentprojectblock.html.php b/module/block/view/recentprojectblock.html.php index 1b08ff76b4..904b870d93 100644 --- a/module/block/view/recentprojectblock.html.php +++ b/module/block/view/recentprojectblock.html.php @@ -40,7 +40,7 @@
- systemMode == 'new'):?> + maxVersion)):?> model === 'waterfall'): ?> project->waterfall; ?> From 7a319662442b1ac059d27094e9e146b4b86e6dce Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Fri, 2 Apr 2021 16:30:37 +0800 Subject: [PATCH 05/10] * Modify the navigation highlight problem. --- module/story/js/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/js/common.js b/module/story/js/common.js index 217822b340..3a1a033bff 100644 --- a/module/story/js/common.js +++ b/module/story/js/common.js @@ -5,7 +5,7 @@ $(function() if(typeof(rawModule) == 'undefined') rawModule = 'product'; if(typeof(app) == 'undefined') app = ''; if(typeof(execution) != 'undefined') rawModule = 'projectstory'; - if(['project', 'projectstory'].indexOf(rawModule) === -1) + if(['project', 'projectstory'].indexOf(rawModule) === -1 && app != 'qa') { $('#navbar .nav li').removeClass('active'); $("#navbar .nav li[data-id=" + storyType + ']').addClass('active'); From fa6076a51ef2a0f32b3cd7934fb5e5de56d9a67e Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Fri, 2 Apr 2021 16:54:53 +0800 Subject: [PATCH 06/10] * Fix sort story list error. --- module/common/model.php | 2 +- module/story/control.php | 1 + module/story/view/zerocase.html.php | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 8140970169..ea506919c1 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1003,7 +1003,7 @@ class commonModel extends model $className = 'header'; } $link = helper::createLink($module, $method, sprintf($vars, $orderBy)); - echo $isMobile ? html::a($link, $label, '', "class='$className'") : html::a($link, $label, '', "class='$className'"); + echo $isMobile ? html::a($link, $label, '', "class='$className' data-app={$app->openApp}") : html::a($link, $label, '', "class='$className' data-app={$app->openApp}"); } /** diff --git a/module/story/control.php b/module/story/control.php index fb5e7e3306..55c1e5eac7 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1524,6 +1524,7 @@ class story extends control $this->view->stories = $this->story->getZeroCase($productID, $branchID, $sort); $this->view->users = $this->user->getPairs('noletter'); $this->view->productID = $productID; + $this->view->branchID = $branchID; $this->view->orderBy = $orderBy; $this->view->suiteList = $this->loadModel('testsuite')->getSuites($productID); $this->view->browseType = ''; diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php index 3e1d3ac7fc..cb0afb7d3b 100644 --- a/module/story/view/zerocase.html.php +++ b/module/story/view/zerocase.html.php @@ -23,7 +23,10 @@ - + app->rawModule = 'story'; + $vars = "productID=$productID&branchID=$branchID&orderBy=%s"; + ?>
From 46173c8c0769293ddd6b005a1f9d38bf90f3d961 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Fri, 2 Apr 2021 16:56:42 +0800 Subject: [PATCH 07/10] * Fix an error. --- module/product/view/browse.html.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 07f84b5b8c..cfe989510d 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -254,7 +254,8 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; moduleName . ucfirst($this->methodName); $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable'); - $vars = "productID=$productID&branch=$branch&browseType=$browseType¶m=$param&storyType=$storyType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; + if($from == 'product') $vars = "productID=$productID&branch=$branch&browseType=$browseType¶m=$param&storyType=$storyType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; + if($from == 'project') $vars = "projectID=$projectID&productID=$productID&branch=$branch&browseType=$browseType¶m=$param&storyType=$storyType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; if($useDatatable) include '../../common/view/datatable.html.php'; $setting = $this->datatable->getSetting('product'); From 5c2a4ac1f419cc04a963652fef4f86ea93a1f750 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 2 Apr 2021 17:53:06 +0800 Subject: [PATCH 08/10] * Add en lang. --- module/action/lang/en.php | 2 ++ module/webhook/lang/en.php | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 3806faf4f3..a17fee3b6f 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -9,6 +9,8 @@ * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ +global $config; + $lang->action->common = 'Log'; $lang->action->product = $lang->productCommon; $lang->action->project = 'Project'; diff --git a/module/webhook/lang/en.php b/module/webhook/lang/en.php index f2a23ddba3..5e0ed228f7 100644 --- a/module/webhook/lang/en.php +++ b/module/webhook/lang/en.php @@ -9,6 +9,8 @@ $lang->webhook->chooseDept = 'Choose department'; $lang->webhook->assigned = 'AssignedTo'; $lang->webhook->setting = 'Settings'; +$lang->webhook->logAction = 'Webhook Log'; + $lang->webhook->browse = 'Browse'; $lang->webhook->create = 'Create'; $lang->webhook->edit = 'Edit'; @@ -40,6 +42,8 @@ $lang->webhook->typeList['dinggroup'] = 'Dingding Robot'; $lang->webhook->typeList['dinguser'] = 'Dingding Notifier'; $lang->webhook->typeList['wechatgroup'] = 'Enterprise WeChat Robot'; $lang->webhook->typeList['wechatuser'] = 'Enterprise WeChat Notifier'; +$lang->webhook->typeList['feishugroup'] = 'Feishu Robot'; +$lang->webhook->typeList['feishuuser'] = 'Feishu Notifier'; $lang->webhook->typeList['default'] = 'Others'; $lang->webhook->sendTypeList['sync'] = 'Synchronous'; From 1a8a95c24daeb53a6106114da4642c91897d23cf Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Fri, 2 Apr 2021 14:29:21 +0300 Subject: [PATCH 09/10] * Fix bug#11783. --- module/common/model.php | 8 +++++++- module/index/view/index.html.php | 6 +++++- module/search/control.php | 3 ++- module/search/lang/de.php | 2 +- module/search/lang/en.php | 2 +- module/search/lang/fr.php | 2 +- module/search/lang/vi.php | 2 +- module/search/lang/zh-cn.php | 2 +- 8 files changed, 19 insertions(+), 8 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index ea506919c1..3bc439eb29 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -726,11 +726,17 @@ class commonModel extends model public static function printSearchBox() { global $lang; + global $config; + $searchObject = 'bug'; echo "
"; echo html::hidden('searchType', $searchObject); echo "
-EOD; $lang->upgrade->mergeProgramDesc = <<Next, we will migrate the previous historical product and iteration data to the project set and under the project, with the following scenario for migration.


Option 1: Product and iteration organized by product line

@@ -99,6 +79,12 @@ $lang->upgrade->mergeProgramDesc = <<These iterations can be selected to fall under a new project.

EOD; +$lang->upgrade->to15Mode['classic'] = 'Keep the old version'; +$lang->upgrade->to15Mode['new'] = 'New program management mode'; + +$lang->upgrade->selectedModeTips['classic'] = 'You can also switch to the new program set management mode in the background-Customize in the future.'; +$lang->upgrade->selectedModeTips['new'] = 'Switching to the program management mode requires merging the previous data, and the system will guide you to complete this operation.'; + $lang->upgrade->line = 'Product Line'; $lang->upgrade->program = 'Merge Project'; $lang->upgrade->existProgram = 'Existing programs'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index f3a9e8d02c..bd4d2c3922 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -56,6 +56,7 @@ $lang->user->type = 'User Type'; $lang->user->cropAvatar = 'Crop Avatar'; $lang->user->cropAvatarTip = 'Drag and drop the box to select the image clipping range.'; $lang->user->cropImageTip = 'The image used is too small, the recommended image size is at least 48x48, the current image size is %s'; +$lang->user->captcha = 'Captcha'; $lang->user->legendBasic = 'Basic Information'; $lang->user->legendContribution = 'Contribution'; @@ -128,6 +129,7 @@ $lang->user->lockWarning = "You can try %s times."; $lang->user->loginLocked = "Please contact the administrator to unlock your account or try %s minutes later."; $lang->user->weakPassword = "Your password does not meet the requirements."; $lang->user->errorWeak = "Passwords cannot use [%s] these commonly used weak passwords."; +$lang->user->errorCaptcha = "Captcha Error"; $lang->user->roleList[''] = ''; $lang->user->roleList['dev'] = 'Developer'; @@ -243,4 +245,4 @@ $lang->user->noticeResetFile = "
Contact the Administrator to reset your pass "; $lang->user->notice4Safe = "Warning: Weak password of one click package detected"; $lang->user->process4DIR = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Delete or rename the %s directory. Visit: https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html"; -$lang->user->process4DB = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html"; \ No newline at end of file +$lang->user->process4DB = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html"; diff --git a/module/webhook/lang/en.php b/module/webhook/lang/en.php index 5e0ed228f7..0a4fc2913e 100644 --- a/module/webhook/lang/en.php +++ b/module/webhook/lang/en.php @@ -62,6 +62,11 @@ $lang->webhook->wechatAgentId = 'Agent ID'; $lang->webhook->wechatUserid = 'Wechat Userid'; $lang->webhook->wechatBindStatus = 'Bind Status'; +$lang->webhook->feishuAppId = 'Feishu App ID'; +$lang->webhook->feishuAppSecret = 'Feishu App Secret'; +$lang->webhook->feishuUserid = 'Feishu Users'; +$lang->webhook->feishuBindStatus = 'Feishu Bind Status'; + $lang->webhook->zentaoUser = 'Zentao User'; $lang->webhook->dingBindStatusList['0'] = 'No';