Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'devops21_caoyanyi' into 'devops21'

Browse Source 
* Finish task #48606.

See merge request easycorp/zentaopms!1717
This commit is contained in:
李玉春
2022-02-08 06:30:56 +00:00
parent 1657a135f1 bfca373bca
commit d64b74b285
6 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/resource.php
+3
View File
@@ -1404,6 +1404,7 @@ $lang->resource->sonarqube->browseProject = 'browseProject';
$lang->resource->sonarqube->deleteProject = 'deleteProject';
$lang->resource->sonarqube->execJob = 'execJob';
$lang->resource->sonarqube->reportView = 'reportView';
$lang->resource->sonarqube->browseIssue = 'browseIssue';
$lang->sonarqube->methodOrder[5] = 'browse';
$lang->sonarqube->methodOrder[10] = 'create';
@@ -1412,6 +1413,8 @@ $lang->sonarqube->methodOrder[20] = 'delete';
$lang->sonarqube->methodOrder[25] = 'browseProject';
$lang->sonarqube->methodOrder[35] = 'deleteProject';
$lang->sonarqube->methodOrder[40] = 'execJob';
$lang->sonarqube->methodOrder[45] = 'reportView';
$lang->sonarqube->methodOrder[50] = 'browseIssue';
/* merge request. */
$lang->resource->mr = new stdclass();
module/sonarqube/control.php
+7 -1
View File
@@ -86,6 +86,7 @@ class sonarqube extends control
$this->view->measures = $measures;
$this->view->qualitygate = $qualitygate;
$this->view->projectName = $projectName;
$this->view->sonarqubeID = $job->sonarqubeServer;
$this->display();
}
@@ -269,14 +270,19 @@ class sonarqube extends control
$pager = new pager($recTotal, $recPerPage, $pageID);
$sonarqubeProjectList = array_chunk($sonarqubeProjectList, $pager->recPerPage);
/* Get success jobs of sonarqube.*/
$projectJobPairs = $this->loadModel('job')->getJobBySonarqubeProject($sonarqubeID, $projectKeyList);
$successJobs = $this->loadModel('compile')->getSuccessJobs($projectJobPairs);
$this->view->sonarqube = $this->loadModel('pipeline')->getByID($sonarqubeID);
$this->view->keyword = urldecode(urldecode($keyword));
$this->view->pager = $pager;
$this->view->title = $this->lang->sonarqube->common . $this->lang->colon . $this->lang->sonarqube->browseProject;
$this->view->sonarqubeID = $sonarqubeID;
$this->view->sonarqubeProjectList = (empty($sonarqubeProjectList) or empty($sonarqubeProjectList[$pageID - 1])) ? array() : $sonarqubeProjectList[$pageID - 1];
$this->view->projectJobPairs = $this->loadModel('job')->getJobBySonarqubeProject($sonarqubeID, $projectKeyList);
$this->view->projectJobPairs = $projectJobPairs;
$this->view->orderBy = $orderBy;
$this->view->successJobs = $successJobs;
$this->display();
}
module/sonarqube/lang/en.php
+1
View File
@@ -14,6 +14,7 @@ $lang->sonarqube->placeholderSearch = 'Project name';
$lang->sonarqube->execJob = "Exec SonarQube Job";
$lang->sonarqube->desc = 'Description';
$lang->sonarqube->reportView = "SonarQube Report";
$lang->sonarqube->browseIssue = "SonarQube Issue List";
$lang->sonarqube->id = 'ID';
$lang->sonarqube->name = "Server Name";
module/sonarqube/lang/zh-cn.php
+1
View File
@@ -14,6 +14,7 @@ $lang->sonarqube->placeholderSearch = '请输入项目名称';
$lang->sonarqube->execJob = "执行SonarQube任务";
$lang->sonarqube->desc = '描述';
$lang->sonarqube->reportView = "SonarQube报告";
$lang->sonarqube->browseIssue = "SonarQube问题列表";
$lang->sonarqube->id = 'ID';
$lang->sonarqube->name = "服务器名称";
module/sonarqube/view/browseproject.html.php
+2 -1
View File
@@ -49,7 +49,7 @@
<th class='c-key text-left'><?php common::printOrderLink('key', $orderBy, $vars, $lang->sonarqube->projectKey);?></th>
<th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->sonarqube->projectName);?></th>
<th class='text-left'><?php common::printOrderLink('lastAnalysisDate', $orderBy, $vars, $lang->sonarqube->projectlastAnalysis);?></th>
<th class='c-actions-2'><?php echo $lang->actions;?></th>
<th class='c-actions-3'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -67,6 +67,7 @@
{
$jobID = $projectJobPairs[$sonarqubeProject->key];
common::printIcon('sonarqube', 'execJob', "jobID=$jobID", '', 'list', 'sonarqube', 'hiddenwin');
if(in_array($jobID, $successJobs)) common::printIcon('sonarqube', 'reportView', "jobID=$jobID", '', 'list', 'audit', '', 'iframe', true);
}
?>
</td>
module/sonarqube/view/reportview.html.php
+1 -1
View File
@@ -19,7 +19,7 @@
<div class="page-title">
<span class='text' title="<?php echo $projectName;?>">
<h4>
<?php echo $projectName;?>
<?php echo common::hasPriv('sonarqube', 'browseIssue') ? html::a($this->createLink('sonarqube', 'browseIssue', "sonarqubeID={$sonarqubeID}&project={$projectName}"), $projectName, '_parent') : $projectName;?>
<?php if(!empty($qualitygate->projectStatus->status) and $qualitygate->projectStatus->status != 'NONE'):?>
<span class="label label-badge label-<?php echo zget($config->sonarqube->projectStatusClass, $qualitygate->projectStatus->status);?>">
<?php echo zget($lang->sonarqube->qualitygateList, $qualitygate->projectStatus->status);?>