From 1fd2392c71d6d4acfc7ebe890ef4f0ee8728c63d Mon Sep 17 00:00:00 2001 From: zenggang Date: Sun, 8 Oct 2023 03:23:46 +0000 Subject: [PATCH] * Adjust artifact list. --- module/artifactrepo/config/dtable.php | 1 + module/artifactrepo/lang/de.php | 3 +++ module/artifactrepo/lang/en.php | 3 +++ module/artifactrepo/lang/fr.php | 3 +++ module/artifactrepo/lang/zh-cn.php | 3 +++ module/artifactrepo/model.php | 2 +- module/upgrade/config.php | 2 +- 7 files changed, 15 insertions(+), 2 deletions(-) diff --git a/module/artifactrepo/config/dtable.php b/module/artifactrepo/config/dtable.php index 84bdb126c2..017c14de8f 100644 --- a/module/artifactrepo/config/dtable.php +++ b/module/artifactrepo/config/dtable.php @@ -21,6 +21,7 @@ $config->artifactrepo->dtable->fieldList['type']['sortType'] = true; $config->artifactrepo->dtable->fieldList['status']['title'] = $lang->artifactrepo->status; $config->artifactrepo->dtable->fieldList['status']['sortType'] = true; +$config->artifactrepo->dtable->fieldList['status']['map'] = $lang->artifactrepo->statusList; $config->artifactrepo->dtable->fieldList['url']['title'] = $lang->artifactrepo->url; $config->artifactrepo->dtable->fieldList['url']['width'] = '400'; diff --git a/module/artifactrepo/lang/de.php b/module/artifactrepo/lang/de.php index 136dc249a0..5ea8e81670 100644 --- a/module/artifactrepo/lang/de.php +++ b/module/artifactrepo/lang/de.php @@ -20,3 +20,6 @@ $lang->artifactrepo->url = 'Repo Address'; $lang->artifactrepo->confirmDelete = 'Are you sure you want to delete this artifact repo?'; $lang->artifactrepo->deleteError = 'The artifact repo is already associated with a build. Please cancel the association and try again'; $lang->artifactrepo->loseConnect = 'Artifact repo server not responding'; + +$lang->artifactrepo->statusList['online'] = 'online'; +$lang->artifactrepo->statusList['offline'] = 'offline'; diff --git a/module/artifactrepo/lang/en.php b/module/artifactrepo/lang/en.php index 136dc249a0..5ea8e81670 100644 --- a/module/artifactrepo/lang/en.php +++ b/module/artifactrepo/lang/en.php @@ -20,3 +20,6 @@ $lang->artifactrepo->url = 'Repo Address'; $lang->artifactrepo->confirmDelete = 'Are you sure you want to delete this artifact repo?'; $lang->artifactrepo->deleteError = 'The artifact repo is already associated with a build. Please cancel the association and try again'; $lang->artifactrepo->loseConnect = 'Artifact repo server not responding'; + +$lang->artifactrepo->statusList['online'] = 'online'; +$lang->artifactrepo->statusList['offline'] = 'offline'; diff --git a/module/artifactrepo/lang/fr.php b/module/artifactrepo/lang/fr.php index 136dc249a0..5ea8e81670 100644 --- a/module/artifactrepo/lang/fr.php +++ b/module/artifactrepo/lang/fr.php @@ -20,3 +20,6 @@ $lang->artifactrepo->url = 'Repo Address'; $lang->artifactrepo->confirmDelete = 'Are you sure you want to delete this artifact repo?'; $lang->artifactrepo->deleteError = 'The artifact repo is already associated with a build. Please cancel the association and try again'; $lang->artifactrepo->loseConnect = 'Artifact repo server not responding'; + +$lang->artifactrepo->statusList['online'] = 'online'; +$lang->artifactrepo->statusList['offline'] = 'offline'; diff --git a/module/artifactrepo/lang/zh-cn.php b/module/artifactrepo/lang/zh-cn.php index f77c289b54..309c306f3e 100644 --- a/module/artifactrepo/lang/zh-cn.php +++ b/module/artifactrepo/lang/zh-cn.php @@ -20,3 +20,6 @@ $lang->artifactrepo->url = '库地址'; $lang->artifactrepo->confirmDelete = '您确认要删除该制品库吗？'; $lang->artifactrepo->deleteError = '当前制品库中制品已关联版本，请取消关联后重试。'; $lang->artifactrepo->loseConnect = '制品库服务器无法连接'; + +$lang->artifactrepo->statusList['online'] = '在线'; +$lang->artifactrepo->statusList['offline'] = '离线'; diff --git a/module/artifactrepo/model.php b/module/artifactrepo/model.php index 7b52fa0289..4c76d59bc9 100644 --- a/module/artifactrepo/model.php +++ b/module/artifactrepo/model.php @@ -50,7 +50,7 @@ class artifactrepoModel extends model ->fetchAll('id'); foreach($artifactRepos as $repo) { - $repo->url .= '/repository/' . $repo->repoName; + $repo->url .= '/repository/' . $repo->repoName . '/'; } return $artifactRepos; diff --git a/module/upgrade/config.php b/module/upgrade/config.php index 53951abea0..72447cf0db 100644 --- a/module/upgrade/config.php +++ b/module/upgrade/config.php @@ -912,7 +912,7 @@ $config->delete['18_6'][] = 'extension/ipd/ops/control.php'; $config->delete['18_6'][] = 'extension/ipd/ops/js/setting.js'; $config->delete['18_6'][] = 'module/gitlab/js/browseproject.js'; -$config->upgrade->openModules = array('action', 'admin', 'ai', 'api', 'automation', 'backup', 'block', 'branch', 'budget', 'bug', 'build', 'caselib', 'chart', 'metric', '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', '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', 'artifactrepo', 'cne', 'host', 'instance', 'ops', 'serverroom', 'space', 'store', 'system'); +$config->upgrade->openModules = array('action', 'admin', 'ai', 'api', 'automation', 'backup', 'block', 'branch', 'budget', 'bug', 'build', 'caselib', 'chart', 'metric', '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', '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', 'artifactrepo', 'cne', 'host', 'instance', 'ops', 'serverroom', 'space', 'store', 'system', 'solution'); $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');