* Rename jobModel::getGitlabProjectName to gitlabModel::getObjectNameForJob.
This commit is contained in:
@@ -252,6 +252,20 @@ class gitlabModel extends model
|
||||
->fetch('openID');
|
||||
}
|
||||
|
||||
/**
|
||||
* Get gitlab project name of one gitlab project.
|
||||
*
|
||||
* @param int $jobID
|
||||
* @access public
|
||||
* @return string|false
|
||||
*/
|
||||
public function getObjectNameForJob($gitlabID, $projectID)
|
||||
{
|
||||
$project = $this->apiGetSingleProject($gitlabID, $projectID);
|
||||
if(isset($project->name)) return $project->name;
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a gitlab.
|
||||
*
|
||||
|
||||
@@ -404,22 +404,4 @@ class jobModel extends model
|
||||
|
||||
return $compile->status;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get gitlab project name by jobID.
|
||||
*
|
||||
* @param int $jobID
|
||||
* @access public
|
||||
* @return string|false
|
||||
*/
|
||||
public function getGitlabProjectName($jobID)
|
||||
{
|
||||
$job = $this->getByID($jobID);
|
||||
if(strtolower($job->engine) != 'gitlab') return false;
|
||||
$gitlabID = $job->server;
|
||||
$projectID = $job->pipeline;
|
||||
$project = $this->loadModel('gitlab')->apiGetSingleProject($gitlabID, $projectID);
|
||||
if(isset($project->name)) return $project->name;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,7 +46,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->job->getGitlabProjectName($job->id);?>
|
||||
<?php if(strtolower($job->engine) == 'gitlab') $job->pipeline = $this->loadModel('gitlab')->getObjectNameForJob($job->server, $job->pipeline);?>
|
||||
<?php $jenkins = urldecode($job->pipeline) . '@' . $job->jenkinsName;?>
|
||||
<td title='<?php echo $jenkins; ?>'><?php echo $jenkins; ?></td>
|
||||
<?php $triggerConfig = $this->job->getTriggerConfig($job);?>
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->job->server;?></th>
|
||||
<?php if(strtolower($job->engine) == 'gitlab') $job->pipeline = $this->job->getGitlabProjectName($job->id);?>
|
||||
<?php if(strtolower($job->engine) == 'gitlab') $job->pipeline = $this->loadModel('gitlab')->getObjectNameForJob($job->server, $job->pipeline);?>
|
||||
<td><?php echo urldecode($job->pipeline) . '@' . $jenkins->name;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
Reference in New Issue
Block a user