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

* Fix sql error in DMDB.

Browse Source
This commit is contained in:
zhujinyong
2023-11-29 15:05:10 +08:00
parent b3ebaa575e
commit da34a320a6
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/zentao.sql
+11 -11
View File
@@ -13245,7 +13245,7 @@ CREATE TABLE IF NOT EXISTS `zt_workflowaction` (
`name` varchar(50) NOT NULL DEFAULT '',
`type` enum('single','batch') NOT NULL DEFAULT 'single',
`batchMode` enum('same','different') NOT NULL DEFAULT 'different',
`extensionType` varchar(10) NOT NULL DEFAULT 'override' COMMENT 'none | extend | override',
`extensionType` varchar(10) NOT NULL DEFAULT 'override',
`open` varchar(20) NOT NULL DEFAULT '',
`position` enum('menu','browseandview','browse','view') NOT NULL DEFAULT 'browseandview',
`layout` char(20) NOT NULL DEFAULT '',
@@ -13467,13 +13467,13 @@ CREATE INDEX `version` ON `zt_workflowversion` (`version`);
-- DROP TABLE IF EXISTS `zt_workflowreport`;
CREATE TABLE IF NOT EXISTS `zt_workflowreport` (
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
`module` varchar(30) NOT NULL COMMENT 'module name',
`name` varchar(100) NOT NULL COMMENT 'report name',
`type` enum('pie', 'line', 'bar') NOT NULL DEFAULT 'pie' COMMENT 'report type',
`countType` enum('sum', 'count') NOT NULL DEFAULT 'sum' COMMENT 'report count method',
`displayType` enum('value', 'percent') NOT NULL DEFAULT 'value' COMMENT 'report display method',
`dimension` varchar(130) NOT NULL COMMENT 'dimension field code of zt_workflowfield',
`fields` text NOT NULL COMMENT 'count fileds code of zt_workflowfield,use comma split',
`module` varchar(30) NOT NULL,
`name` varchar(100) NOT NULL,
`type` enum('pie', 'line', 'bar') NOT NULL DEFAULT 'pie',
`countType` enum('sum', 'count') NOT NULL DEFAULT 'sum',
`displayType` enum('value', 'percent') NOT NULL DEFAULT 'value',
`dimension` varchar(130) NOT NULL,
`fields` text NOT NULL,
`order` smallint(5) unsigned NOT NULL DEFAULT '0',
`createdBy` varchar(30) NOT NULL DEFAULT '',
`createdDate` datetime NULL,
@@ -14194,9 +14194,9 @@ CREATE TABLE IF NOT EXISTS `zt_solutions` (
`id` mediumint(8) NOT NULL AUTO_INCREMENT,
`project` mediumint(8) unsigned NOT NULL DEFAULT '0',
`execution` mediumint(8) unsigned NOT NULL DEFAULT '0',
`contents` text NOT NULL COMMENT '问题描述',
`support` text NOT NULL COMMENT '是否需要高层支持',
`measures` text NOT NULL COMMENT '解决建议',
`contents` text NOT NULL,
`support` text NOT NULL,
`measures` text NOT NULL,
`type` char(30) NOT NULL DEFAULT '',
`addedBy` varchar(30) NOT NULL DEFAULT '',
`addedDate` date NULL,
module/bug/model.php
+4 -1
View File
@@ -3750,7 +3750,10 @@ class bugModel extends model
$relatedObjectIdList = array();
$relatedObjects = array();
foreach($bugs as $bug) $relatedObjectIdList[$bug->$object] = $bug->$object;
foreach($bugs as $bug)
{
if(is_numeric($bug->$object)) $relatedObjectIdList[$bug->$object] = $bug->$object;
}
if($object == 'openedBuild' or $object == 'resolvedBuild') $object = 'build';