From 6937b214748874e291a732eb8a2818986917d33f Mon Sep 17 00:00:00 2001 From: wangyuting Date: Fri, 19 Sep 2025 14:11:52 +0800 Subject: [PATCH] * [task#149886,done,0.1h,0h] Remove cmcl module. --- db/update22.0.sql | 1 + module/admin/config.php | 2 +- module/admin/lang/menu.php | 2 +- module/group/lang/de.php | 1 - module/group/lang/en.php | 1 - module/group/lang/fr.php | 1 - module/group/lang/zh-cn.php | 1 - module/group/packagemanager.php | 11 ----------- module/upgrade/config.php | 2 +- module/upgrade/systemfiles.txt | 12 ------------ 10 files changed, 4 insertions(+), 30 deletions(-) diff --git a/db/update22.0.sql b/db/update22.0.sql index 82abfb5e59..4e14233059 100644 --- a/db/update22.0.sql +++ b/db/update22.0.sql @@ -62,6 +62,7 @@ UPDATE `zt_lang` SET `value` = '版本验证环节' WHERE `module` = 'testcase' ALTER TABLE `zt_review` ADD `version` varchar(255) NOT NULL DEFAULT '' AFTER `docVersion`; ALTER TABLE `zt_review` ADD `deliverable` mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER `title`; UPDATE `zt_review` SET `status` = 'reviewing' WHERE `status` = 'wait'; +UPDATE `zt_review` SET `status` = 'pass' WHERE `status` = 'auditing' or `status` = 'done'; ALTER TABLE `zt_object` ADD `status` varchar(20) NOT NULL DEFAULT '' AFTER `type`; ALTER TABLE `zt_object` ADD `approval` mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER `status`; diff --git a/module/admin/config.php b/module/admin/config.php index abc85e9141..d0fd40143e 100755 --- a/module/admin/config.php +++ b/module/admin/config.php @@ -8,7 +8,7 @@ if(!isset($config->safe->weak)) $config->safe->weak = '123456,password,12345,123 $config->admin->menuGroup['system'] = array('custom|mode', 'backup', 'cron', 'action|trash', 'admin|xuanxuan', 'setting|xuanxuan', 'admin|license', 'admin|checkweak', 'admin|resetpwdsetting', 'admin|safe', 'cache|setting', 'custom|timezone', 'search|buildindex', 'admin|tableengine', 'admin|metriclib', 'ldap', 'custom|libreoffice', 'conference', 'watermark', 'client', 'system|browsebackup', 'system|restorebackup'); $config->admin->menuGroup['company'] = array('dept', 'company', 'user', 'group', 'tutorial'); $config->admin->menuGroup['switch'] = array('admin|setmodule'); -$config->admin->menuGroup['feature'] = array('auditcl', 'stage', 'baseline', 'design', 'cmcl', 'custom|flow', 'custom|code', 'custom|percent','custom|estimate', 'custom|hours', 'subject', 'holiday', 'reviewsetting', 'custom|project', 'custom|set', 'custom|product', 'custom|execution', 'custom|required', 'custom|kanban', 'measurement', 'meetingroom', 'custom|browsestoryconcept', 'custom|kanban', 'sqlbuilder', 'report', 'custom|limittaskdate', 'measurement'); +$config->admin->menuGroup['feature'] = array('auditcl', 'stage', 'baseline', 'design', 'custom|flow', 'custom|code', 'custom|percent','custom|estimate', 'custom|hours', 'subject', 'holiday', 'reviewsetting', 'custom|project', 'custom|set', 'custom|product', 'custom|execution', 'custom|required', 'custom|kanban', 'measurement', 'meetingroom', 'custom|browsestoryconcept', 'custom|kanban', 'sqlbuilder', 'report', 'custom|limittaskdate', 'measurement'); $config->admin->menuGroup['message'] = array('mail', 'webhook', 'sms', 'message'); $config->admin->menuGroup['dev'] = array('dev', 'entry', 'editor'); $config->admin->menuGroup['extension'] = array('extension'); diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php index 689024a6b2..56812395b9 100644 --- a/module/admin/lang/menu.php +++ b/module/admin/lang/menu.php @@ -69,7 +69,7 @@ $lang->admin->menuList->company['menuOrder']['15'] = 'group'; $lang->admin->menuList->feature['subMenu']['my'] = array('link' => "{$lang->my->common}|custom|set|module=todo&field=priList", 'exclude' => 'set,required'); $lang->admin->menuList->feature['subMenu']['product'] = array('link' => "{$lang->productCommon}|custom|required|module=product", 'exclude' => 'set,required', 'alias' => 'browsestoryconcept,product'); -$lang->admin->menuList->feature['subMenu']['project'] = array('link' => "{$lang->projectCommon}|custom|required|module=project", 'alias' => 'flow,percent,hours,estimate,project', 'subModule' => 'subject,holiday,baseline,design,auditcl,reviewcl,cmcl', 'exclude' => 'set,required'); +$lang->admin->menuList->feature['subMenu']['project'] = array('link' => "{$lang->projectCommon}|custom|required|module=project", 'alias' => 'flow,percent,hours,estimate,project', 'subModule' => 'subject,holiday,baseline,design,auditcl,reviewcl', 'exclude' => 'set,required'); $lang->admin->menuList->feature['subMenu']['execution'] = array('link' => "{$lang->execution->common}|custom|required|module=execution", 'exclude' => 'required,set', 'alias' => 'execution,limittaskdate', 'subModule' => 'stage'); $lang->admin->menuList->feature['subMenu']['qa'] = array('link' => "{$lang->qa->common}|custom|required|module=bug", 'exclude' => 'set,required'); $lang->admin->menuList->feature['subMenu']['kanban'] = array('link' => "{$lang->kanban->common}|custom|kanban|"); diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 0419711d6a..cd0da213db 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -490,7 +490,6 @@ $lang->group->package->commonSetting = 'Common Setting'; $lang->group->package->stageSetting = 'Stage Setting'; $lang->group->package->deliverable = 'Deliverable Setting'; $lang->group->package->classify = 'Classify'; -$lang->group->package->cmcl = 'Cmcl'; $lang->group->package->auditcl = 'Auditcl'; $lang->group->package->reviewcl = 'Reviewcl'; $lang->group->package->process = 'Process'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 188f6c6a99..8389090e9d 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -490,7 +490,6 @@ $lang->group->package->commonSetting = 'Common Setting'; $lang->group->package->stageSetting = 'Stage Setting'; $lang->group->package->deliverable = 'Deliverable Setting'; $lang->group->package->classify = 'Classify'; -$lang->group->package->cmcl = 'Cmcl'; $lang->group->package->auditcl = 'Auditcl'; $lang->group->package->reviewcl = 'Reviewcl'; $lang->group->package->process = 'Process'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 684e4c4668..bd799ecabb 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -490,7 +490,6 @@ $lang->group->package->commonSetting = 'Common Setting'; $lang->group->package->stageSetting = 'Stage Setting'; $lang->group->package->deliverable = 'Deliverable Setting'; $lang->group->package->classify = 'Classify'; -$lang->group->package->cmcl = 'Cmcl'; $lang->group->package->auditcl = 'Auditcl'; $lang->group->package->reviewcl = 'Reviewcl'; $lang->group->package->process = 'Process'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 235fecaf06..fb19cff741 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -490,7 +490,6 @@ $lang->group->package->commonSetting = '通用配置'; $lang->group->package->stageSetting = '阶段设置'; $lang->group->package->deliverable = '交付物设置'; $lang->group->package->classify = '分类项设置'; -$lang->group->package->cmcl = '审计设置'; $lang->group->package->auditcl = 'QA检查项设置'; $lang->group->package->reviewcl = '评审设置'; $lang->group->package->process = '过程设置'; diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index 512b448e83..f675a9a9ed 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -3079,17 +3079,6 @@ $config->group->package->classify->subset = 'featureconfig'; $config->group->package->classify->privs = array(); $config->group->package->classify->privs['classify-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array(), 'recommend' => array()); -$config->group->package->cmcl = new stdclass(); -$config->group->package->cmcl->order = 50; -$config->group->package->cmcl->subset = 'featureconfig'; -$config->group->package->cmcl->privs = array(); -$config->group->package->cmcl->privs['cmcl-batchCreate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array(), 'recommend' => array('cmcl-delete', 'cmcl-edit')); -$config->group->package->cmcl->privs['cmcl-delete'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array(), 'recommend' => array('cmcl-batchCreate', 'cmcl-edit')); -$config->group->package->cmcl->privs['cmcl-edit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array(), 'recommend' => array('cmcl-batchCreate', 'cmcl-delete')); -$config->group->package->cmcl->privs['cmcl-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array()); -$config->group->package->cmcl->privs['cmcl-view'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array(), 'recommend' => array()); -$config->group->package->cmcl->privs['cmcl-waterfallplusBrowse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array(), 'recommend' => array()); - $config->group->package->auditcl = new stdclass(); $config->group->package->auditcl->order = 20; $config->group->package->auditcl->subset = 'featureconfig'; diff --git a/module/upgrade/config.php b/module/upgrade/config.php index 9b41aca0c0..68aa2595a8 100644 --- a/module/upgrade/config.php +++ b/module/upgrade/config.php @@ -1504,7 +1504,7 @@ $config->delete['21_7_5'][] = 'extension/max/doc/ext/js/app/zentaobiz.ui.js'; $config->delete['21_7_5'][] = 'extension/ipd/doc/ext/js/app/zentaobiz.ui.js'; $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'); -$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'); +$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', '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'); global $lang; $config->upgrade->defaultActions = array(); diff --git a/module/upgrade/systemfiles.txt b/module/upgrade/systemfiles.txt index f20d9a2cae..5cab61a3ca 100644 --- a/module/upgrade/systemfiles.txt +++ b/module/upgrade/systemfiles.txt @@ -879,18 +879,6 @@ ,cm/view/edit.html.php, ,cm/view/report.html.php, ,cm/view/view.html.php, -,cmcl/control.php, -,cmcl/css/browse.css, -,cmcl/js/browse.js, -,cmcl/lang/en.php, -,cmcl/lang/zh-cn.php, -,cmcl/lang/zh-tw.php, -,cmcl/model.php, -,cmcl/view/batchcreate.html.php, -,cmcl/view/browse.html.php, -,cmcl/view/create.cmmi.html.hook.php, -,cmcl/view/edit.html.php, -,cmcl/view/view.html.php, ,common/ext/index.html, ,common/ext/lang/de/bizext.php, ,common/ext/lang/de/crystal.php,