From 80a4d2e7121023e1ad3ff8f33cc99a82f13d7b57 Mon Sep 17 00:00:00 2001 From: sunguangming Date: Thu, 11 Dec 2025 00:38:27 +0000 Subject: [PATCH] * [misc] modify zentao version. --- config/config.php | 2 +- db/{update22.0.sql => update21.7.8.sql} | 0 module/misc/lang/de.php | 1 + module/misc/lang/en.php | 1 + module/misc/lang/fr.php | 1 + module/misc/lang/zh-cn.php | 1 + module/upgrade/config/upgradeflow.php | 6 +++--- module/upgrade/lang/version.php | 17 +++++++++++++---- module/upgrade/model.php | 1 - 9 files changed, 21 insertions(+), 9 deletions(-) rename db/{update22.0.sql => update21.7.8.sql} (100%) diff --git a/config/config.php b/config/config.php index 566e28f608..a696535ee5 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '21.7.7'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '22.0'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->liteVersion = '1.2'; // 迅捷版版本。 The version of Lite. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. diff --git a/db/update22.0.sql b/db/update21.7.8.sql similarity index 100% rename from db/update22.0.sql rename to db/update21.7.8.sql diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php index a18b81dfe1..c5d66ac3b2 100644 --- a/module/misc/lang/de.php +++ b/module/misc/lang/de.php @@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +$lang->misc->releaseDate['21.7.8'] = '2025-12-30'; $lang->misc->releaseDate['21.7.7'] = '2025-10-29'; $lang->misc->releaseDate['21.7.6'] = '2025-09-29'; $lang->misc->releaseDate['21.7.5'] = '2025-09-11'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 0b70e320fa..b342999d29 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -115,6 +115,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +$lang->misc->releaseDate['21.7.8'] = '2025-12-30'; $lang->misc->releaseDate['21.7.7'] = '2025-10-29'; $lang->misc->releaseDate['21.7.6'] = '2025-09-29'; $lang->misc->releaseDate['21.7.5'] = '2025-09-11'; diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php index 43587f47e6..ba8094943b 100644 --- a/module/misc/lang/fr.php +++ b/module/misc/lang/fr.php @@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +$lang->misc->releaseDate['21.7.8'] = '2025-12-30'; $lang->misc->releaseDate['21.7.7'] = '2025-10-29'; $lang->misc->releaseDate['21.7.6'] = '2025-09-29'; $lang->misc->releaseDate['21.7.5'] = '2025-09-11'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 58fb3c85df..fd189d2b41 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -115,6 +115,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ +$lang->misc->releaseDate['21.7.8'] = '2025-12-30'; $lang->misc->releaseDate['21.7.7'] = '2025-10-29'; $lang->misc->releaseDate['21.7.6'] = '2025-09-29'; $lang->misc->releaseDate['21.7.5'] = '2025-09-11'; diff --git a/module/upgrade/config/upgradeflow.php b/module/upgrade/config/upgradeflow.php index 43f8fcddb0..83cd16d205 100644 --- a/module/upgrade/config/upgradeflow.php +++ b/module/upgrade/config/upgradeflow.php @@ -113,8 +113,8 @@ $config->upgrade->execFlow['21_6_1'] = array('xxsqls' => "$appRoot/db/up $config->upgrade->execFlow['21_7'] = array('functions' => 'fixWorkflowNameForExecution'); $config->upgrade->execFlow['21_7_1'] = array('functions' => 'processActionProduct'); $config->upgrade->execFlow['21_7_5'] = array('functions' => 'weekly-addBuiltinWeeklyTemplate,adjustPriv21_7_5'); -$config->upgrade->execFlow['21_7_7'] = array('functions' => 'importBuildinWorkflow,processWorkflowDatasource,alterTableFields', 'params' => array('importBuildinWorkflow' => array('all', 'cm,projectchange,risk,opportunity,issue'), 'processWorkflowDatasource' => array(array('baselineStatus' => 'cm_status', 'baselineReviewResult' => 'cm_reviewResult', 'projectchangeUrgencyList' => 'projectchange_urgency', 'projectchangeTypeList' => 'projectchange_type', 'projectchangeStatus' => 'projectchange_status', 'projectchangeReviewResult' => 'projectchange_reviewResult', 'riskSource' => 'risk_source', 'riskCategory' => 'risk_category', 'riskStrategy' => 'risk_strategy', 'riskStatus' => 'risk_status', 'riskImpact' => 'risk_impact', 'riskProbability' => 'risk_probability', 'riskRate' => 'risk_rate', 'riskPri' => 'risk_pri', 'riskCancelReason' => 'risk_cancelReason', 'issuePri' => 'issue_pri', 'issueSeverity' => 'issue_severity', 'issueType' => 'issue_type', 'issueResolution' => 'issue_resolution', 'issueStatus' => 'issue_status', 'opportunitySource' => 'opportunity_source', 'opportunityType' => 'opportunity_type', 'opportunityStrategy' => 'opportunity_strategy', 'opportunityStatus' => 'opportunity_status', 'opportunityImpact' => 'opportunity_impact', 'opportunityChance' => 'opportunity_chance', 'opportunityPri' => 'opportunity_pri', 'opportunityCancelReason' => 'opportunity_cancelReason')))); -$config->upgrade->execFlow['21_7_8'] = array('functions' => 'initAIPrompts'); +$config->upgrade->execFlow['21_7_7'] = array('functions' => 'alterTableFields'); +$config->upgrade->execFlow['21_7_8'] = array('functions' => 'initAIPrompts,importBuildinWorkflow,processWorkflowDatasource', 'params' => array('importBuildinWorkflow' => array('all', 'cm,projectchange,risk,opportunity,issue'), 'processWorkflowDatasource' => array(array('baselineStatus' => 'cm_status', 'baselineReviewResult' => 'cm_reviewResult', 'projectchangeUrgencyList' => 'projectchange_urgency', 'projectchangeTypeList' => 'projectchange_type', 'projectchangeStatus' => 'projectchange_status', 'projectchangeReviewResult' => 'projectchange_reviewResult', 'riskSource' => 'risk_source', 'riskCategory' => 'risk_category', 'riskStrategy' => 'risk_strategy', 'riskStatus' => 'risk_status', 'riskImpact' => 'risk_impact', 'riskProbability' => 'risk_probability', 'riskRate' => 'risk_rate', 'riskPri' => 'risk_pri', 'riskCancelReason' => 'risk_cancelReason', 'issuePri' => 'issue_pri', 'issueSeverity' => 'issue_severity', 'issueType' => 'issue_type', 'issueResolution' => 'issue_resolution', 'issueStatus' => 'issue_status', 'opportunitySource' => 'opportunity_source', 'opportunityType' => 'opportunity_type', 'opportunityStrategy' => 'opportunity_strategy', 'opportunityStatus' => 'opportunity_status', 'opportunityImpact' => 'opportunity_impact', 'opportunityChance' => 'opportunity_chance', 'opportunityPri' => 'opportunity_pri', 'opportunityCancelReason' => 'opportunity_cancelReason')))); if(!empty($config->isINT)) { @@ -147,7 +147,7 @@ if($config->edition != 'open') $config->upgrade->execFlow['18_3']['functions'] .= ',processDataset,processChart,processReport,processDashboard'; $config->upgrade->execFlow['18_4_beta1']['functions'] = 'processDeployStepAction,updateBISQL,updatePivotStage'; $config->upgrade->execFlow['20_4']['functions'] .= ',updateTaskRelationPriv'; - $config->upgrade->execFlow['21_7_5']['functions'] .= ',modifyProjectWorkflowGroup,upgradeAuditcl,upgradeProcessAndActivity,addWorkflowGroupOtherActivity,addDefaultDeliverableModule,upgradeDesignToDeliverable,buildinTestcaseStageDeliverable,upgradeDeliverable,buildinBaselineReview,upgradeReviewclCategory,upgradeBaselineObjects,upgradeReviewToDeliverable,upgradeBaseline,addDeliverablePrivs,upgradeStageAndPoint,upgradeObjectOfDecision,upgradeClosedFeature,parseDocFetcherURL'; + $config->upgrade->execFlow['21_7_8']['functions'] .= ',modifyProjectWorkflowGroup,upgradeAuditcl,upgradeProcessAndActivity,addWorkflowGroupOtherActivity,addDefaultDeliverableModule,upgradeDesignToDeliverable,buildinTestcaseStageDeliverable,upgradeDeliverable,buildinBaselineReview,upgradeReviewclCategory,upgradeBaselineObjects,upgradeReviewToDeliverable,upgradeBaseline,addDeliverablePrivs,upgradeStageAndPoint,upgradeObjectOfDecision,upgradeClosedFeature,parseDocFetcherURL'; } if(in_array($this->config->edition, array('max', 'ipd'))) $config->upgrade->execFlow['18_7']['functions'] = 'processOldMetrics,processHistoryDataForMetric,metric-updateMetricDate'; diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index 8e4b9bd592..8f7e2fa5a0 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -219,7 +219,9 @@ $lang->upgrade->fromVersions['21_7_3'] = '21.7.3'; $lang->upgrade->fromVersions['21_7_4'] = '21.7.4'; $lang->upgrade->fromVersions['21_7_5'] = '21.7.5'; $lang->upgrade->fromVersions['21_7_6'] = '21.7.6'; -$lang->upgrade->fromVersions['21_7_7'] = '21.7.7'; // pms insert position. +$lang->upgrade->fromVersions['21_7_7'] = '21.7.7'; +$lang->upgrade->fromVersions['21_7_8'] = '21.7.8'; +$lang->upgrade->fromVersions['22_0'] = '22.0'; // pms insert position. global $config; /* Lite. */ @@ -440,7 +442,9 @@ $lang->upgrade->fromVersions['biz12_3'] = 'Biz12.3'; $lang->upgrade->fromVersions['biz12_4'] = 'Biz12.4'; $lang->upgrade->fromVersions['biz12_4'] = 'Biz12.4'; $lang->upgrade->fromVersions['biz12_5'] = 'Biz12.5'; -$lang->upgrade->fromVersions['biz12_6'] = 'Biz12.6'; // biz insert position. +$lang->upgrade->fromVersions['biz12_6'] = 'Biz12.6'; +$lang->upgrade->fromVersions['biz12_7'] = 'Biz12.7'; +$lang->upgrade->fromVersions['biz13_0'] = 'Biz13.0'; // biz insert position. /* Max. */ $lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4'; @@ -519,7 +523,9 @@ $lang->upgrade->fromVersions['max7_3'] = 'Max7.3'; $lang->upgrade->fromVersions['max7_4'] = 'Max7.4'; $lang->upgrade->fromVersions['max7_4'] = 'Max7.4'; $lang->upgrade->fromVersions['max7_5'] = 'Max7.5'; -$lang->upgrade->fromVersions['max7_6'] = 'Max7.6'; // max insert position. +$lang->upgrade->fromVersions['max7_6'] = 'Max7.6'; +$lang->upgrade->fromVersions['max7_7'] = 'Max7.7'; +$lang->upgrade->fromVersions['max8_0'] = 'Max8.0'; // max insert position. /* Ipd */ $lang->upgrade->fromVersions['ipd1_0_beta1'] = 'Ipd1.0.beta1'; @@ -559,4 +565,7 @@ $lang->upgrade->fromVersions['ipd4_2'] = 'Ipd4.2'; $lang->upgrade->fromVersions['ipd4_3'] = 'Ipd4.3'; $lang->upgrade->fromVersions['ipd4_3'] = 'Ipd4.3'; $lang->upgrade->fromVersions['ipd4_4'] = 'Ipd4.4'; -$lang->upgrade->fromVersions['ipd4_5'] = 'Ipd4.5'; // ipd insert position. +$lang->upgrade->fromVersions['ipd4_5'] = 'Ipd4.5'; +$lang->upgrade->fromVersions['ipd4_6'] = 'Ipd4.6'; +$lang->upgrade->fromVersions['ipd4_7'] = 'Ipd4.7'; +$lang->upgrade->fromVersions['ipd5_0'] = 'Ipd5.0'; // ipd insert position. \ No newline at end of file diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 192f6650c6..ed518dd230 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -11532,7 +11532,6 @@ class upgradeModel extends model $this->dao->delete()->from(TABLE_DELIVERABLE)->where('id')->in(array_keys($deliverables))->andWhere('workflowGroup')->eq('0')->exec(); /* 升级完后把没用的字段删掉。 */ - $this->dao->exec("ALTER TABLE " . TABLE_DELIVERABLE . " DROP `method`, DROP `model`, DROP `type`, DROP `files`;"); $this->dao->exec("ALTER TABLE " . TABLE_DELIVERABLE . " CHANGE `module` `module` mediumint(8) unsigned NOT NULL DEFAULT '0';"); if($deliverableList) $this->upgradeProjectDeliverable($deliverableList);