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

Merge branch release/22.0.beta of zentao/zentaopms (#13177)

Browse Source
This commit is contained in:
刘刚
2026-01-07 16:27:49 +08:00
committed by Gitfox
parent 10cfe6931d 246dcb1167
commit 6d1836407a
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.php
+1 -1
View File
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* 基本设置。Basic settings. */
$config->version = '22.0'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '22.0.beta'; // 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.
module/upgrade/config.php
+11 -11
View File
@@ -341,7 +341,7 @@ $config->upgrade->ipdVersion['ipd4_4'] = '21_7_5';
$config->upgrade->ipdVersion['ipd4_5'] = '21_7_6';
$config->upgrade->ipdVersion['ipd4_6'] = '21_7_7';
$config->upgrade->ipdVersion['ipd4_7'] = '21_7_8';
$config->upgrade->ipdVersion['ipd5_0'] = '22_0'; // ipd insert position.
$config->upgrade->ipdVersion['ipd5_0_beta'] = '22_0_beta'; // ipd insert position.
$config->upgrade->lowerTables = array();
$config->upgrade->lowerTables[$config->db->prefix . 'caseStep'] = $config->db->prefix . 'casestep';
@@ -1730,16 +1730,16 @@ $config->delete['21_7_7'][] = 'module/upgrade/css/confirm.ui.css';
$config->delete['21_7_7'][] = 'module/upgrade/js/common.js';
$config->delete['21_7_7'][] = 'module/upgrade/js/confirm.ui.js';
$config->delete['22_0'][] = 'extension/ipd/auditcl/ext/css/browse.css';
$config->delete['22_0'][] = 'extension/max/auditcl/ext/css/browse.css';
$config->delete['22_0'][] = 'extension/ipd/auditcl/ext/js/edit.js';
$config->delete['22_0'][] = 'extension/max/auditcl/ext/js/edit.js';
$config->delete['22_0'][] = 'extension/ipd/auditcl/view';
$config->delete['22_0'][] = 'extension/max/auditcl/view';
$config->delete['22_0'][] = 'extension/ipd/auditplan/view';
$config->delete['22_0'][] = 'extension/max/auditplan/view';
$config->delete['22_0'][] = 'extension/ipd/project/ext/tao/class/zentaoipd.class.php';
$config->delete['22_0'][] = 'extension/ipd/project/ext/tao/zentaoipd.php';
$config->delete['22_0_beta'][] = 'extension/ipd/auditcl/ext/css/browse.css';
$config->delete['22_0_beta'][] = 'extension/max/auditcl/ext/css/browse.css';
$config->delete['22_0_beta'][] = 'extension/ipd/auditcl/ext/js/edit.js';
$config->delete['22_0_beta'][] = 'extension/max/auditcl/ext/js/edit.js';
$config->delete['22_0_beta'][] = 'extension/ipd/auditcl/view';
$config->delete['22_0_beta'][] = 'extension/max/auditcl/view';
$config->delete['22_0_beta'][] = 'extension/ipd/auditplan/view';
$config->delete['22_0_beta'][] = 'extension/max/auditplan/view';
$config->delete['22_0_beta'][] = 'extension/ipd/project/ext/tao/class/zentaoipd.class.php';
$config->delete['22_0_beta'][] = 'extension/ipd/project/ext/tao/zentaoipd.php';
$config->upgrade->openModules = array('action', 'admin', 'ai', 'bi', 'aiapp', 'api', 'automation', 'backup', 'block', 'branch', 'budget', 'bug', 'build', 'cache', 'caselib', 'chart', 'ci', 'client', 'common', 'company', 'compile', 'convert', 'cron', 'custom', 'datatable', 'dataview', 'dept', 'design', 'dev', 'dimension', 'doc', 'durationestimation', 'entry', 'execution', 'extension', 'file', 'git', 'gitlab', 'group', 'holiday', 'im', 'index', 'index.html', 'install', 'issue', 'jenkins', 'job', 'kanban', 'license', 'mail', 'message', 'metric', 'misc', 'mr', 'my', 'personnel', 'pipeline', 'product', 'productplan', 'productset', 'program', 'programplan', 'project', 'projectbuild', 'projectplan', 'projectrelease', 'projectstory', 'pivot', 'qa', 'release', 'repo', 'report', 'risk', 'score', 'screen', 'search', 'setting', 'sonarqube', 'sso', 'stage', 'stakeholder', 'story', 'subject', 'svn', 'task', 'testcase', 'testreport', 'testsuite', 'testtask', 'todo', 'tree', 'tutorial', 'upgrade', 'user', 'webhook', 'weekly', 'workestimation', 'gitea', 'gogs', 'transfer', 'zahost', 'zanode', 'editor', 'charter', 'roadmap', 'account', 'cne', 'host', 'instance', 'ops', 'serverroom', 'space', 'store', 'system', 'solution', 'demand', 'gitfox', 'epic', 'requirement', 'mark', 'zai');
$config->upgrade->unsetModules = array('design', 'program', 'programplan', 'projectbuild', 'projectrelease', 'stage', 'stakeholder', 'product', 'branch', 'productplan', 'release', 'build', 'qa', 'bug', 'testcase', 'testtask', 'testreport', 'testsuite', 'caselib', 'automation', 'repo', 'ci', 'compile', 'jenkins', 'job', 'svn', 'gitlab', 'sonarqube', 'mr', 'git', 'report', 'sqlbuilder', 'feedback', 'faq', 'attend', 'holiday', 'leave', 'makeup', 'overtime', 'lieu', 'ops', 'host', 'serverroom', 'account', 'domain', 'service', 'deploy', 'conference', 'traincourse', 'pssp', 'baseline', 'classify', 'cm', 'cmcl', 'auditcl', 'reviewcl', 'process', 'activity', 'zoutput', 'auditplan', 'nc', 'subject', 'weekly', 'workestimation', 'issue', 'durationestimation', 'risk', 'opportunity', 'trainplan', 'gapanalysis', 'researchplan', 'researchreport', 'meeting', 'meetingroom', 'budget', 'reviewissue', 'reviewsetting', 'review', 'milestone', 'measurement', 'measrecord', 'assetlib', 'setting', 'im', 'client', 'ldap', 'dev', 'api', 'gitea', 'gogs', 'zanode', 'zahost');
module/upgrade/lang/version.php
+3 -3
View File
@@ -221,7 +221,7 @@ $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';
$lang->upgrade->fromVersions['21_7_8'] = '21.7.8';
$lang->upgrade->fromVersions['22_0'] = '22.0'; // pms insert position.
$lang->upgrade->fromVersions['22_0_beta'] = '22.0.beta'; // pms insert position.
global $config;
/* Lite. */
@@ -444,7 +444,7 @@ $lang->upgrade->fromVersions['biz12_4'] = 'Biz12.4';
$lang->upgrade->fromVersions['biz12_5'] = 'Biz12.5';
$lang->upgrade->fromVersions['biz12_6'] = 'Biz12.6';
$lang->upgrade->fromVersions['biz12_7'] = 'Biz12.7';
$lang->upgrade->fromVersions['biz13_0'] = 'Biz13.0'; // biz insert position.
$lang->upgrade->fromVersions['biz13_0_beta'] = 'Biz13.0.beta'; // biz insert position.
/* Max. */
$lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -525,7 +525,7 @@ $lang->upgrade->fromVersions['max7_4'] = 'Max7.4';
$lang->upgrade->fromVersions['max7_5'] = 'Max7.5';
$lang->upgrade->fromVersions['max7_6'] = 'Max7.6';
$lang->upgrade->fromVersions['max7_7'] = 'Max7.7';
$lang->upgrade->fromVersions['max8_0'] = 'Max8.0'; // max insert position.
$lang->upgrade->fromVersions['max8_0_beta'] = 'Max8.0.beta'; // max insert position.
/* Ipd */
$lang->upgrade->fromVersions['ipd1_0_beta1'] = 'Ipd1.0.beta1';