Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch dev/task-145167 of zentao/zentaopms (#9564)

Browse Source
This commit is contained in:
刘刚
2025-06-17 10:48:46 +08:00
committed by Gitfox
parent 596ed0ac94 f0696687ce
commit 49d8d903ea
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update21.7.1.sql
+2 -2
View File
@@ -14,5 +14,5 @@ UPDATE `zt_workflowgroup` SET `name` = '敏捷式产品研发' WHERE `code` = 's
UPDATE `zt_workflowgroup` SET `name` = '敏捷式项目研发' WHERE `code` = 'scrumproject';
CREATE VIEW `ztv_projectnotpl` AS SELECT * FROM `zt_project` WHERE `deleted` = '0' AND `isTpl` = 0;
CREATE VIEW `ztv_tasknotpl` AS SELECT * FROM `zt_task` WHERE `deleted` = '0' AND `isTpl` = 0;
CREATE OR REPLACE VIEW `ztv_projectnotpl` AS SELECT * FROM `zt_project` WHERE `deleted` = '0' AND `isTpl` = 0;
CREATE OR REPLACE VIEW `ztv_tasknotpl` AS SELECT * FROM `zt_task` WHERE `deleted` = '0' AND `isTpl` = 0;
db/zentao.sql
+3 -1
View File
@@ -13652,6 +13652,8 @@ DROP VIEW IF EXISTS `view_datasource_12`;
DROP VIEW IF EXISTS `view_datasource_41`;
DROP VIEW IF EXISTS `view_datasource_54`;
DROP VIEW IF EXISTS `view_datasource_55`;
DROP VIEW IF EXISTS `ztv_projectnotpl`;
DROP VIEW IF EXISTS `ztv_tasknotpl`;
CREATE VIEW `view_datasource_2` AS select `id`,`title` from `zt_story` where `deleted` = '0' and type = 'epic';
CREATE VIEW `view_datasource_3` AS select `id`,`title` from `zt_story` where `deleted` = '0' and type = 'requirement';
@@ -13664,7 +13666,7 @@ CREATE VIEW `view_datasource_12` AS select `id`,`title` from `zt_productplan` wh
CREATE VIEW `view_datasource_41` AS select `id`,`title` from `zt_case` where `deleted` = '0';
CREATE VIEW `view_datasource_54` AS select `id`,`name` from `zt_task` where `deleted` = '0' and vision = 'lite';
CREATE VIEW `view_datasource_55` AS select `id`,`title` from `zt_feedback` where `deleted` = '0';
CREATE VIEW `ztv_projectnotpl` AS select * from `zt_project` where `deleted` = '0' and `isTpl` = 0;
CREATE VIEW `ztv_projectnotpl` AS select * from `zt_project` where `deleted` = '0' and `isTpl` = 0;
CREATE VIEW `ztv_tasknotpl` AS select * from `zt_task` where `deleted` = '0' and `isTpl` = 0;
-- DROP TABLE IF EXISTS `zt_durationestimation`;
module/execution/control.php
+1 -1
View File
@@ -2601,7 +2601,7 @@ class execution extends control
$this->session->set('reportList', $uri, 'qa');
/* use first execution if executionID does not exist. */
if(!isset($this->executions[$executionID])) $executionID = key($this->executions);
$executionID = $this->execution->checkAccess($executionID, $this->executions);
$this->execution->setMenu($executionID);
$execution = $this->execution->getByID($executionID);
module/execution/model.php
-2
View File
@@ -159,8 +159,6 @@ class executionModel extends model
unset($this->lang->execution->menu->devops);
unset($this->lang->execution->menu->build);
unset($this->lang->execution->menu->release);
unset($this->lang->execution->menu->action);
unset($this->lang->execution->menu->dynamic);
unset($this->lang->execution->menu->effort);
unset($this->lang->execution->menu->more);
module/install/test/model/createtable.php
+14 -3
View File
@@ -6,21 +6,32 @@ title=测试 installModel->createTable();
timeout=0
cid=1
- 测试是否能正常生成18.0版本的数据库表。 @1
- 测试是否能正常生成mysql7.0版本的数据库表。 @1
- 测试生成的数据库product表是否含有数据。 @0
- 测试生成的数据库story表是否含有数据。 @0
- 测试生成的数据库project表是否含有数据。 @0
- 测试生成的数据库bug表是否含有数据。 @0
- 测试生成的数据库task表是否含有数据。 @0
*/
include dirname(__FILE__, 5) . '/test/lib/init.php';
su('admin');
zenData('company')->gen(1);
zenData('product')->gen(10);
zenData('project')->gen(10);
zenData('task')->gen(10);
global $tester, $config;
$tester->loadModel('install');
r($tester->install->createTable('18.0', false, 1)) && p() && e('1'); // 测试是否能正常生成18.0版本的数据库表。
r($tester->install->createTable('7.0', false, 1)) && p() && e('1'); // 测试是否能正常生成mysql7.0版本的数据库表。
zenData('company')->gen(1); //为了防止后面执行的单测无法运行。
r($tester->install->fetchByID(1, 'product')) && p() && e('0'); // 测试生成的数据库product表是否含有数据。
r($tester->install->fetchByID(1, 'product')) && p() && e('0'); // 测试生成的数据库product表是否含有数据。
r($tester->install->fetchByID(1, 'story')) && p() && e('0'); // 测试生成的数据库story表是否含有数据。
r($tester->install->fetchByID(1, 'project')) && p() && e('0'); // 测试生成的数据库project表是否含有数据。
r($tester->install->fetchByID(1, 'bug')) && p() && e('0'); // 测试生成的数据库bug表是否含有数据。
r($tester->install->fetchByID(1, 'task')) && p() && e('0'); // 测试生成的数据库task表是否含有数据。