From eb5522881b807b738bd1fcb63fa2fea68dca726e Mon Sep 17 00:00:00 2001 From: hujunqing Date: Wed, 10 Dec 2025 02:02:07 +0000 Subject: [PATCH 1/4] [bug#67766] support custom field label. --- lib/form/form.class.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/form/form.class.php b/lib/form/form.class.php index ca5c724d07..dfc6552d5e 100644 --- a/lib/form/form.class.php +++ b/lib/form/form.class.php @@ -423,7 +423,14 @@ class form extends fixer { $rawModule = $app->rawModule == 'feedback' && in_array($app->rawMethod, array('touserstory', 'toepic')) ? 'story' : $app->rawModule; $errorKey = isset($config['type']) && $config['type'] == 'array' ? "{$field}[]" : $field; - $fieldName = isset($app->lang->{$rawModule}->$field) ? $app->lang->{$rawModule}->$field : $field; + if(isset($config['label'])) + { + $fieldName = $config['label']; + } + else + { + $fieldName = isset($app->lang->{$rawModule}->$field) ? $app->lang->{$rawModule}->$field : $field; + } if(!isset($this->errors[$errorKey])) $this->errors[$errorKey] = array(); $this->errors[$errorKey][] = sprintf($app->lang->error->notempty, $fieldName); } From 9abcbd04f38e5e08618eaa91c5039a3ab743d0b0 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Wed, 10 Dec 2025 14:43:37 +0800 Subject: [PATCH 2/4] * Optimize date field. --- db/zentao.sql | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 005d5914b9..0a9413376a 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -14487,7 +14487,7 @@ CREATE TABLE IF NOT EXISTS `zt_issue` ( `resolution` varchar(30) NOT NULL DEFAULT '', `resolutionComment` text DEFAULT NULL, `objectID` varchar(255) NOT NULL DEFAULT '', - `resolvedDate` datetime DEFAULT NULL, + `resolvedDate` date DEFAULT NULL, `status` varchar(30) NOT NULL DEFAULT '', `owner` varchar(255) NOT NULL DEFAULT '', `lib` int unsigned NOT NULL DEFAULT 0, @@ -14500,7 +14500,7 @@ CREATE TABLE IF NOT EXISTS `zt_issue` ( `activateBy` varchar(30) NOT NULL DEFAULT '', `activateDate` datetime DEFAULT NULL, `closedBy` varchar(30) NOT NULL DEFAULT '', - `closedDate` datetime DEFAULT NULL, + `closedDate` date DEFAULT NULL, `assignedTo` varchar(30) NOT NULL DEFAULT '', `assignedBy` varchar(30) NOT NULL DEFAULT '', `assignedDate` datetime DEFAULT NULL, @@ -14538,18 +14538,18 @@ CREATE TABLE IF NOT EXISTS `zt_risk` ( `resolution` mediumtext DEFAULT NULL, `resolvedBy` varchar(30) NOT NULL DEFAULT '', `activateBy` varchar(30) NOT NULL DEFAULT '', - `activateDate` datetime DEFAULT NULL, + `activateDate` date DEFAULT NULL, `assignedTo` varchar(30) NOT NULL DEFAULT '', + `assignedDate` datetime DEFAULT NULL, `closedBy` varchar(30) NOT NULL DEFAULT '', `closedDate` datetime DEFAULT NULL, `cancelBy` varchar(30) NOT NULL DEFAULT '', - `cancelDate` datetime DEFAULT NULL, + `cancelDate` date DEFAULT NULL, `cancelReason` varchar(30) NOT NULL DEFAULT '', `hangupBy` varchar(30) NOT NULL DEFAULT '', - `hangupDate` datetime DEFAULT NULL, + `hangupDate` date DEFAULT NULL, `trackedBy` varchar(30) NOT NULL DEFAULT '', - `trackedDate` datetime DEFAULT NULL, - `assignedDate` datetime DEFAULT NULL, + `trackedDate` date DEFAULT NULL, `approvedDate` datetime DEFAULT NULL, `deleted` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id`) From fe4e08f67347860e062aa7e011d6b320962e67ae Mon Sep 17 00:00:00 2001 From: wangyuting Date: Wed, 10 Dec 2025 15:32:10 +0800 Subject: [PATCH 3/4] * Optimize code. --- db/updatedatatype.sql | 7 ------- 1 file changed, 7 deletions(-) diff --git a/db/updatedatatype.sql b/db/updatedatatype.sql index 595a744d74..5f55be7d20 100644 --- a/db/updatedatatype.sql +++ b/db/updatedatatype.sql @@ -761,12 +761,10 @@ ALTER TABLE `zt_issue` MODIFY COLUMN `severity` tinyint unsigned NOT NULL DEFAULT 0, MODIFY COLUMN `type` varchar(30) NOT NULL DEFAULT '', MODIFY COLUMN `resolution` varchar(30) NOT NULL DEFAULT '', - MODIFY COLUMN `resolvedDate` datetime NULL DEFAULT NULL, MODIFY COLUMN `lib` int unsigned NOT NULL DEFAULT 0, MODIFY COLUMN `from` int unsigned NOT NULL DEFAULT 0, MODIFY COLUMN `version` smallint unsigned NOT NULL DEFAULT 1, MODIFY COLUMN `activateDate` datetime NULL DEFAULT NULL, - MODIFY COLUMN `closedDate` datetime NULL DEFAULT NULL, MODIFY COLUMN `approvedDate` datetime NULL DEFAULT NULL, MODIFY COLUMN `deleted` char(1) NOT NULL DEFAULT '0'; ALTER TABLE `zt_issue` @@ -1479,13 +1477,8 @@ ALTER TABLE `zt_risk` MODIFY COLUMN `lib` int unsigned NOT NULL DEFAULT 0, MODIFY COLUMN `from` int unsigned NOT NULL DEFAULT 0, MODIFY COLUMN `version` smallint unsigned NOT NULL DEFAULT 1, - MODIFY COLUMN `activateDate` datetime NULL DEFAULT NULL, MODIFY COLUMN `closedDate` datetime NULL DEFAULT NULL, - MODIFY COLUMN `cancelDate` datetime NULL DEFAULT NULL, MODIFY COLUMN `cancelReason` varchar(30) NOT NULL DEFAULT '', - MODIFY COLUMN `hangupDate` datetime NULL DEFAULT NULL, - MODIFY COLUMN `trackedDate` datetime NULL DEFAULT NULL, - MODIFY COLUMN `assignedDate` datetime NULL DEFAULT NULL, MODIFY COLUMN `approvedDate` datetime NULL DEFAULT NULL, MODIFY COLUMN `deleted` char(1) NOT NULL DEFAULT '0'; ALTER TABLE `zt_risk` From d344b47cece7d1a2ccf820493f598b798f797aa2 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Wed, 10 Dec 2025 15:38:01 +0800 Subject: [PATCH 4/4] * Optimize code. --- db/updatedatatype.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/updatedatatype.sql b/db/updatedatatype.sql index 5f55be7d20..5d0d603957 100644 --- a/db/updatedatatype.sql +++ b/db/updatedatatype.sql @@ -1479,6 +1479,7 @@ ALTER TABLE `zt_risk` MODIFY COLUMN `version` smallint unsigned NOT NULL DEFAULT 1, MODIFY COLUMN `closedDate` datetime NULL DEFAULT NULL, MODIFY COLUMN `cancelReason` varchar(30) NOT NULL DEFAULT '', + MODIFY COLUMN `assignedDate` datetime NULL DEFAULT NULL, MODIFY COLUMN `approvedDate` datetime NULL DEFAULT NULL, MODIFY COLUMN `deleted` char(1) NOT NULL DEFAULT '0'; ALTER TABLE `zt_risk`