From bd7b43a1a5cbf8ffc2176899793775102c6b461f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= Date: Sun, 23 Apr 2023 18:44:51 +0800 Subject: [PATCH 1/7] * Fix bug for api. --- api/v1/entries/testresults.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/v1/entries/testresults.php b/api/v1/entries/testresults.php index e53ceedf34..0bf52a4a01 100644 --- a/api/v1/entries/testresults.php +++ b/api/v1/entries/testresults.php @@ -70,10 +70,12 @@ class testresultsEntry extends entry { $results = array(); $reals = array(); + $count = 0; foreach($this->requestBody->steps as $index => $step) { /* When post data more than case steps, break after take useful data. */ - if($index + 1 > count($steps)) break; + $count ++; + if($count > count($steps)) break; $stepID = $steps[$index]; $results[$stepID] = $step->result; From 3f9958a62054b78f6f28afd9c6618535f43b6b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Mon, 24 Apr 2023 08:51:28 +0800 Subject: [PATCH 2/7] * Add project.md. --- module/project/doc/project.md | 129 ++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 module/project/doc/project.md diff --git a/module/project/doc/project.md b/module/project/doc/project.md new file mode 100644 index 0000000000..501efaea47 --- /dev/null +++ b/module/project/doc/project.md @@ -0,0 +1,129 @@ +## project方法列表 + +### control.php + +``` +createGuide +export +ajaxGetDropMenu +ajaxGetCopyProjects +ajaxGetUnlinkTips +ajaxGetLinkedProducts +ajaxGetObjectInfo +index +browse +kanban +programTitle +create +edit +batchEdit +view +group +createGroup +dynamic +execution +bug +testcase +testreport +testtask +build +managePriv +team +unlinkMember +manageMembers +manageGroupMember +copyGroup +editGroup +start +suspend +close +activate +delete +updateOrder +whitelist +addWhitelist +unbindWhitelist +manageProducts +ajaxGetExecutions +ajaxGetPairsByExecution +``` + +### model.php + + //迁移到tao.php中 + checkPriv + accessDenied + buildSearchFrom + processProjectPrivs + createManageLink + buildMenuQuery + getProgramTree + getTreeMenu + buildProjectBuildSearchForm + changeExecutionStatus + updateShadowProduct + updateProductProgram + checkCanChangeModel + updateRepoRelations + linkedRepoPairs + + //保留 + getMultiLinkedProducts + getBudgetUnitList + getSwitcher + getByID + getByShadowProduct + getInfoList + getParentProgram + getOverviewList + getTotalStoriesByProject + getTotalBugByProject + getTotalTaskByProject + getWaterfallProgress + getWaterfallPVEVAC + getWorkhour + getProjectsConsumed + getProjectLink + getStatData + getPairs + getPairsByProgram + getBrotherProjects + getByIdList + getPairsByIdList + getBranchesByProject + getBranchGroupByProject + getNoProductList + getProjectExecutionPairs + getPairsByModel + getStoriesByProject + getTeamMembers + getTeamMemberPairs + getTeamMemberGroup + getMembers2Import + getStats4Kanban + getBudgetWithUnit + getDataByProject + create + update + batchUpdate + start + putoff + suspend + activate + close + isClickable + setMenu + saveState + unlinkMember + manageMembers + updateProducts + updateInvolvedUserView + computerProgress + setNoMultipleMenu + buildOperateMenuZin + buildOperateMenu + buildOperateViewMenu + buildOperateBrowseMenuZin + buildOperateBrowseMenu + printCell + printCellZin \ No newline at end of file From 8545188e704b1fbc1f0e38d9ef16ac1bae11000c Mon Sep 17 00:00:00 2001 From: Hao Sun Date: Mon, 24 Apr 2023 09:02:42 +0800 Subject: [PATCH 3/7] * fix inlink not work in namespace zin --- zin/zentao/zentao.func.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zin/zentao/zentao.func.php b/zin/zentao/zentao.func.php index 9ef1443a8e..04a4ac224c 100644 --- a/zin/zentao/zentao.func.php +++ b/zin/zentao/zentao.func.php @@ -35,7 +35,7 @@ function createLink($moduleName, $methodName = 'index', $vars = array(), $viewTy function inLink($methodName = 'index', $vars = '', $viewType = '', $onlybody = false) { - return inlink($methodName, $vars, $viewType, $onlybody); + return \inlink($methodName, $vars, $viewType, $onlybody); } function zget($var, $key, $valueWhenNone = false, $valueWhenExists = false) @@ -50,7 +50,7 @@ function getWebRoot($full = false) function hasPriv($module, $method, $object = null, $vars = '') { - return common::hasPriv($module, $method, $object, $vars); + return \common::hasPriv($module, $method, $object, $vars); } function isFieldRequired($name) From 81dccead8db5847e916bb708774f48e12ee682a3 Mon Sep 17 00:00:00 2001 From: liyang Date: Mon, 24 Apr 2023 09:12:45 +0800 Subject: [PATCH 4/7] * Add group. --- module/project/doc/project.txt | 117 +++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 module/project/doc/project.txt diff --git a/module/project/doc/project.txt b/module/project/doc/project.txt new file mode 100644 index 0000000000..8b498d19ae --- /dev/null +++ b/module/project/doc/project.txt @@ -0,0 +1,117 @@ +createGuide ## 1 zk +export +ajaxGetDropMenu +ajaxGetCopyProjects +ajaxGetUnlinkTips +ajaxGetLinkedProducts +ajaxGetObjectInfo +index +browse +kanban +programTitle +create +edit +batchEdit +view +group +createGroup +dynamic +execution +bug +testcase +testreport +testtask +build +managePriv +team +unlinkMember +manageMembers +manageGroupMember +copyGroup +editGroup ## 2 sgm +start +suspend +close +activate +delete +updateOrder +whitelist +addWhitelist +unbindWhitelist +manageProducts +ajaxGetExecutions +ajaxGetPairsByExecution +checkPriv +accessDenied +buildSearchFrom +processProjectPrivs +createManageLink +buildMenuQuery +getProgramTree +getTreeMenu +buildProjectBuildSearchForm +changeExecutionStatus +updateShadowProduct +updateProductProgram +checkCanChangeModel +updateRepoRelations +linkedRepoPairs +getMultiLinkedProducts +getBudgetUnitList +getSwitcher ## 3 ly +getByID +getByShadowProduct +getInfoList +getParentProgram +getOverviewList +getTotalStoriesByProject +getTotalBugByProject +getTotalTaskByProject +getWaterfallProgress +getWaterfallPVEVAC +getWorkhour +getProjectsConsumed +getProjectLink +getStatData +getPairs +getPairsByProgram +getBrotherProjects +getByIdList +getPairsByIdList +getBranchesByProject +getBranchGroupByProject +getNoProductList +getProjectExecutionPairs +getPairsByModel +getStoriesByProject +getTeamMembers +getTeamMemberPairs +getTeamMemberGroup +getMembers2Import +getStats4Kanban ## 4 dk +getBudgetWithUnit +getDataByProject +create +update +batchUpdate +start +putoff +suspend +activate +close +isClickable +setMenu +saveState +unlinkMember +manageMembers +updateProducts +updateInvolvedUserView +computerProgress +setNoMultipleMenu +buildOperateMenuZin +buildOperateMenu +buildOperateViewMenu +buildOperateBrowseMenuZin +buildOperateBrowseMenu +printCell +printCellZin From 45781a4b62bc781e81675247d06c8d7bc7205c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Mon, 24 Apr 2023 09:24:36 +0800 Subject: [PATCH 5/7] * Remove project.md, add 2.md. --- module/project/doc/2.md | 85 ++++++++++++++++++++++ module/project/doc/project.md | 129 ---------------------------------- 2 files changed, 85 insertions(+), 129 deletions(-) create mode 100644 module/project/doc/2.md delete mode 100644 module/project/doc/project.md diff --git a/module/project/doc/2.md b/module/project/doc/2.md new file mode 100644 index 0000000000..362ce6dcc7 --- /dev/null +++ b/module/project/doc/2.md @@ -0,0 +1,85 @@ +## 三国-2组 + +### control.php + +- editGroup + + ``` + public function editGroup(int $groupID):void + { + + } + + //此方法保留在control.php中 + //此方法用到了group模块的getById方法 + ``` + +- start + +- suspend + +- close + +- activate + +- delete + +- updateOrder + +- whitelist + +- addWhitelist + +- unbindWhitelist + +- manageProducts + +- ajaxGetExecutions + +- ajaxGetPairsByExecution + +### model.php + +- checkPriv + + ``` + public function checkPriv(int $projectID):bool + { + + } + //此方法迁移到tao.php中 + ``` + + + +- accessDenied + +- buildSearchFrom + +- processProjectPrivs + +- createManageLink + +- buildMenuQuery + +- getProgramTree + +- getTreeMenu + +- buildProjectBuildSearchForm + +- changeExecutionStatus + +- updateShadowProduct + +- updateProductProgram + +- checkCanChangeModel + +- updateRepoRelations + +- linkedRepoPairs + +- getMultiLinkedProducts + +- getBudgetUnitList \ No newline at end of file diff --git a/module/project/doc/project.md b/module/project/doc/project.md deleted file mode 100644 index 501efaea47..0000000000 --- a/module/project/doc/project.md +++ /dev/null @@ -1,129 +0,0 @@ -## project方法列表 - -### control.php - -``` -createGuide -export -ajaxGetDropMenu -ajaxGetCopyProjects -ajaxGetUnlinkTips -ajaxGetLinkedProducts -ajaxGetObjectInfo -index -browse -kanban -programTitle -create -edit -batchEdit -view -group -createGroup -dynamic -execution -bug -testcase -testreport -testtask -build -managePriv -team -unlinkMember -manageMembers -manageGroupMember -copyGroup -editGroup -start -suspend -close -activate -delete -updateOrder -whitelist -addWhitelist -unbindWhitelist -manageProducts -ajaxGetExecutions -ajaxGetPairsByExecution -``` - -### model.php - - //迁移到tao.php中 - checkPriv - accessDenied - buildSearchFrom - processProjectPrivs - createManageLink - buildMenuQuery - getProgramTree - getTreeMenu - buildProjectBuildSearchForm - changeExecutionStatus - updateShadowProduct - updateProductProgram - checkCanChangeModel - updateRepoRelations - linkedRepoPairs - - //保留 - getMultiLinkedProducts - getBudgetUnitList - getSwitcher - getByID - getByShadowProduct - getInfoList - getParentProgram - getOverviewList - getTotalStoriesByProject - getTotalBugByProject - getTotalTaskByProject - getWaterfallProgress - getWaterfallPVEVAC - getWorkhour - getProjectsConsumed - getProjectLink - getStatData - getPairs - getPairsByProgram - getBrotherProjects - getByIdList - getPairsByIdList - getBranchesByProject - getBranchGroupByProject - getNoProductList - getProjectExecutionPairs - getPairsByModel - getStoriesByProject - getTeamMembers - getTeamMemberPairs - getTeamMemberGroup - getMembers2Import - getStats4Kanban - getBudgetWithUnit - getDataByProject - create - update - batchUpdate - start - putoff - suspend - activate - close - isClickable - setMenu - saveState - unlinkMember - manageMembers - updateProducts - updateInvolvedUserView - computerProgress - setNoMultipleMenu - buildOperateMenuZin - buildOperateMenu - buildOperateViewMenu - buildOperateBrowseMenuZin - buildOperateBrowseMenu - printCell - printCellZin \ No newline at end of file From 4e41688eb8d37a5471acf06d4a7b49b378d95991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Mon, 24 Apr 2023 09:40:09 +0800 Subject: [PATCH 6/7] * Remove 2.md. --- module/project/doc/2.md | 85 ----------------------------------------- 1 file changed, 85 deletions(-) delete mode 100644 module/project/doc/2.md diff --git a/module/project/doc/2.md b/module/project/doc/2.md deleted file mode 100644 index 362ce6dcc7..0000000000 --- a/module/project/doc/2.md +++ /dev/null @@ -1,85 +0,0 @@ -## 三国-2组 - -### control.php - -- editGroup - - ``` - public function editGroup(int $groupID):void - { - - } - - //此方法保留在control.php中 - //此方法用到了group模块的getById方法 - ``` - -- start - -- suspend - -- close - -- activate - -- delete - -- updateOrder - -- whitelist - -- addWhitelist - -- unbindWhitelist - -- manageProducts - -- ajaxGetExecutions - -- ajaxGetPairsByExecution - -### model.php - -- checkPriv - - ``` - public function checkPriv(int $projectID):bool - { - - } - //此方法迁移到tao.php中 - ``` - - - -- accessDenied - -- buildSearchFrom - -- processProjectPrivs - -- createManageLink - -- buildMenuQuery - -- getProgramTree - -- getTreeMenu - -- buildProjectBuildSearchForm - -- changeExecutionStatus - -- updateShadowProduct - -- updateProductProgram - -- checkCanChangeModel - -- updateRepoRelations - -- linkedRepoPairs - -- getMultiLinkedProducts - -- getBudgetUnitList \ No newline at end of file From 713f4d6262a8a447325d6de885e004adc5dae641 Mon Sep 17 00:00:00 2001 From: Lufei Date: Mon, 24 Apr 2023 09:49:31 +0800 Subject: [PATCH 7/7] * Fix install error. --- db/zentao.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/zentao.sql b/db/zentao.sql index 47aba708be..7932c24ba6 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -352,7 +352,7 @@ CREATE TABLE IF NOT EXISTS `zt_burn` ( `execution` mediumint(8) unsigned NOT NULL DEFAULT '0', `product` mediumint(8) unsigned NOT NULL DEFAULT '0', `task` mediumint(8) unsigned NOT NULL DEFAULT '0', - `date` date NULL, + `date` date NOT NULL default '0000-00-00', `estimate` float NOT NULL, `left` float NOT NULL, `consumed` float NOT NULL,