Merge branch 'devops21_liyuchun' into 'devops21'

* Fix error.

See merge request easycorp/zentaopms!1775

module/action/view/trash.html.php

@@ -75,7 +75,7 @@
             {
                 $tab = '';
                 if($action->objectType == 'meeting') $tab = $action->project ? "data-app='project'" : "data-app='my'";
-                echo html::a($this->createLink($module, $methodName, $params), $action->objectName, '_self', "title={$action->objectName} $tab");
+                echo html::a($this->createLink($module, $methodName, $params), $action->objectName, '_self', "title='{$action->objectName}' $tab");
             }
             ?>
           </td>

module/mr/model.php

@@ -449,7 +449,7 @@ class mrModel extends model
             $rawMR = new stdClass();
             foreach($rawMRList[$MR->gitlabID][$MR->targetProject] as $projcetRawMR)
             {
-                if($projcetRawMR->iid == $MR->mriid)
+                if(isset($projcetRawMR->iid) and $projcetRawMR->iid == $MR->mriid)
                 {
                     $rawMR = $projcetRawMR;
                     break;

test/data/job.yaml

@@ -33,7 +33,7 @@ fields:
     format: ""
   - field: frame
     note: "工具/框架"
-    range: junit,testng,phpunit,pytest,jtest,cppunit,gtest,qtest
+    range: sonarqube,junit,testng,phpunit,pytest,jtest,cppunit,gtest,qtest
     prefix: ""
     postfix: ""
     loop: 0
@@ -48,6 +48,20 @@ fields:
     postfix: ""
     loop: 0
     format: ""
+  - field: sonarqubeServer
+    note: "Sonarqube服务器"
+    range: 2,0{8}
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: projectKey
+    note: "Sonarqube项目"
+    range: zentaopms
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
   - field: svnDir
     note: "SVN监控路径"
     range: caselib,effort,git,mail,output

test/model/gitlab/getversion.php

@@ -27,6 +27,6 @@ $result = $gitlab->getVersion($gitlabServer->url, $gitlabServer->token . 'a');
 if(!isset($result->version)) $result = 'return false';
 r($result) && p() && e('return false'); //通过正确的host，错误的token获取api权限
 
-$result = $gitlab->getVersion($gitlabServer->url . 'a', $gitlabServer->token);
+$result = $gitlab->getVersion($gitlabServer->url . '1', $gitlabServer->token);
 if(!isset($result->version)) $result = 'return false';
 r($result) && p() && e('return false'); //通过错误或低版本的的host，token获取api权限

test/model/sonarqube/getlinkedproducts.php

@@ -0,0 +1,24 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+
+/**
+
+title=测试 sonarqubeModel::getLinkedProducts();
+cid=1
+pid=1
+
+*/
+
+$sonarqube = $tester->loadModel('sonarqube');
+
+$sonarqubeID = 0;
+$projectKey  = '';
+$result      = $sonarqube->getLinkedProducts($sonarqubeID, $projectKey);
+if(empty($result)) $result = 'return false';
+r($result) && p() && e('return false'); //通过错误的sonarqubeID和projectKey获取关联产品ID
+
+$sonarqubeID = 2;
+$projectKey  = 'zentaopms';
+$result      = $sonarqube->getLinkedProducts($sonarqubeID, $projectKey);
+r($result) && p() && e('1'); //通过正确的sonarqubeID和projectKey获取关联产品ID