* Rename getObjectNameForJob to getProjectName.

This commit is contained in:
dingguodong
2021-08-18 10:40:15 +08:00
parent 474b438db7
commit 14de596bc0
3 changed files with 5 additions and 4 deletions
+3 -2
View File
@@ -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;
+1 -1
View File
@@ -56,7 +56,7 @@
<td title='<?php echo $job->repoName;?>'><?php echo $job->repoName;?></td>
<td><?php echo zget($lang->job->engineList, $job->engine);?></td>
<td><?php echo zget($lang->job->frameList, $job->frame);?></td>
<?php if(strtolower($job->engine) == 'gitlab') $job->pipeline = $this->loadModel('gitlab')->getObjectNameForJob($job->server, $job->pipeline);?>
<?php if(strtolower($job->engine) == 'gitlab') $job->pipeline = $this->loadModel('gitlab')->getProjectName($job->server, $job->pipeline);?>
<?php $jenkins = urldecode($job->pipeline) . '@' . $job->jenkinsName;?>
<td class='c-name' title='<?php echo $jenkins;?>'><?php echo $jenkins;?></td>
<?php $triggerConfig = $this->job->getTriggerConfig($job);?>
+1 -1
View File
@@ -55,7 +55,7 @@
</tr>
<tr>
<th><?php echo $lang->job->server;?></th>
<?php if(strtolower($job->engine) == 'gitlab') $job->pipeline = $this->loadModel('gitlab')->getObjectNameForJob($job->server, $job->pipeline);?>
<?php if(strtolower($job->engine) == 'gitlab') $job->pipeline = $this->loadModel('gitlab')->getProjectName($job->server, $job->pipeline);?>
<td><?php echo urldecode($job->pipeline) . '@' . $jenkins->name;?></td>
</tr>
<tr>