From 14de596bc0f1fc905a6c0cea6ac0eefd839e61fd Mon Sep 17 00:00:00 2001 From: dingguodong Date: Wed, 18 Aug 2021 10:40:15 +0800 Subject: [PATCH] * Rename getObjectNameForJob to getProjectName. --- module/gitlab/model.php | 5 +++-- module/job/view/browse.html.php | 2 +- module/job/view/view.html.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 087721d341..9cc0439aa1 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -283,11 +283,12 @@ class gitlabModel extends model /** * Get gitlab project name of one gitlab project. * - * @param int $jobID + * @param int $gitlabID + * @param int $projectID * @access public * @return string|false */ - public function getObjectNameForJob($gitlabID, $projectID) + public function getProjectName($gitlabID, $projectID) { $project = $this->apiGetSingleProject($gitlabID, $projectID); if(isset($project->name)) return $project->name; diff --git a/module/job/view/browse.html.php b/module/job/view/browse.html.php index 8e3d0139d5..7e0b15f941 100644 --- a/module/job/view/browse.html.php +++ b/module/job/view/browse.html.php @@ -56,7 +56,7 @@ repoName;?> job->engineList, $job->engine);?> job->frameList, $job->frame);?> - engine) == 'gitlab') $job->pipeline = $this->loadModel('gitlab')->getObjectNameForJob($job->server, $job->pipeline);?> + engine) == 'gitlab') $job->pipeline = $this->loadModel('gitlab')->getProjectName($job->server, $job->pipeline);?> pipeline) . '@' . $job->jenkinsName;?> job->getTriggerConfig($job);?> diff --git a/module/job/view/view.html.php b/module/job/view/view.html.php index cab49151d0..95a6d3cd61 100644 --- a/module/job/view/view.html.php +++ b/module/job/view/view.html.php @@ -55,7 +55,7 @@ job->server;?> - engine) == 'gitlab') $job->pipeline = $this->loadModel('gitlab')->getObjectNameForJob($job->server, $job->pipeline);?> + engine) == 'gitlab') $job->pipeline = $this->loadModel('gitlab')->getProjectName($job->server, $job->pipeline);?> pipeline) . '@' . $jenkins->name;?>