From aaef96cce676ffd5f472ed1fb50397fc8d841d7c Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Tue, 14 Nov 2023 11:16:40 +0800 Subject: [PATCH] * Hide task create repo branch. --- module/group/lang/resource.php | 4 ++-- module/group/packagemanager.php | 2 +- module/task/model.php | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 1ecba08fe4..561bf2b1c1 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1296,7 +1296,7 @@ $lang->resource->repo->linkTask = 'linkTask'; $lang->resource->repo->unlink = 'unlink'; $lang->resource->repo->import = 'importAction'; $lang->resource->repo->createRepo = 'createRepoAction'; -$lang->resource->repo->createBranch = 'createBranchAction'; +//$lang->resource->repo->createBranch = 'createBranchAction'; $lang->repo->methodOrder[5] = 'create'; $lang->repo->methodOrder[10] = 'edit'; @@ -1318,7 +1318,7 @@ $lang->repo->methodOrder[90] = 'linkTask'; $lang->repo->methodOrder[95] = 'unlink'; $lang->repo->methodOrder[100] = 'import'; $lang->repo->methodOrder[105] = 'createRepo'; -$lang->repo->methodOrder[110] = 'createBranch'; +//$lang->repo->methodOrder[110] = 'createBranch'; $lang->resource->ci = new stdclass(); $lang->resource->ci->commitResult = 'commitResult'; diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index 9f6477cf4f..26b039a2d3 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -3880,7 +3880,7 @@ $config->group->package->manageRepo->privs['repo-create'] = array('edit $config->group->package->manageRepo->privs['repo-edit'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 15, 'depend' => array('repo-maintain'), 'recommend' => array('repo-create')); $config->group->package->manageRepo->privs['repo-apiGetRepoByUrl'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 20, 'depend' => array('repo-maintain'), 'recommend' => array()); $config->group->package->manageRepo->privs['repo-import'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 25, 'depend' => array('repo-maintain'), 'recommend' => array('repo-create')); -$config->group->package->manageRepo->privs['repo-createBranch'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 25, 'depend' => array('repo-maintain'), 'recommend' => array()); +//$config->group->package->manageRepo->privs['repo-createBranch'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 25, 'depend' => array('repo-maintain'), 'recommend' => array()); $config->group->package->deleteRepo = new stdclass(); $config->group->package->deleteRepo->order = 2500; diff --git a/module/task/model.php b/module/task/model.php index d2401bbf8d..c5bc94e7d3 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -4267,11 +4267,11 @@ class taskModel extends model $plmCanStart = !($isPLMMode and empty($execution['canStart'])); if($plmCanStart) $menu .= $this->buildMenu('task', 'start', $params, $task, 'view', '', '', 'iframe showinonlybody', true); if($plmCanStart) $menu .= $this->buildMenu('task', 'restart', $params, $task, 'view', '', '', 'iframe showinonlybody', true); - if(empty($task->linkedBranch)) - { - $hasRepo = $this->loadModel('repo')->getRepoPairs('execution', $task->execution, false); - if($hasRepo) $menu .= $this->buildMenu('repo', 'createBranch', $params . "&execution={$task->execution}", $task, '', 'treemap', '', 'iframe showinonlybody', true, '', $this->lang->repo->createBranchAction); - } + //if(empty($task->linkedBranch)) + //{ + // $hasRepo = $this->loadModel('repo')->getRepoPairs('execution', $task->execution, false); + // if($hasRepo) $menu .= $this->buildMenu('repo', 'createBranch', $params . "&execution={$task->execution}", $task, '', 'treemap', '', 'iframe showinonlybody', true, '', $this->lang->repo->createBranchAction); + //} if($plmCanStart) $menu .= $this->buildMenu('task', 'recordEstimate', $params, $task, 'view', '', '', 'iframe showinonlybody', true); $menu .= $this->buildMenu('task', 'pause', $params, $task, 'view', '', '', 'iframe showinonlybody', true);