Merge branch release/21.7.5 of zentao/zentaopms (#11246)

module/projectrelease/control.php

@@ -88,7 +88,7 @@ class projectrelease extends control
         $execution = $this->loadModel('execution')->getByID($executionID);
 
         $this->view->title         = (isset($project->name) ? $project->name : $execution->name) . $this->lang->hyphen . $this->lang->release->browse;
-        $this->view->products      = $this->product->getProductPairsByProject($projectID);
+        $this->view->products      = $this->product->getPairs('all', 0, '', 'all');
         $this->view->pageSummary   = $this->release->getPageSummary($releases, $type);
         $this->view->projectID     = $projectID;
         $this->view->executionID   = $executionID;

module/projectrelease/js/browse.ui.js

@@ -1,5 +1,11 @@
 window.renderCell = function(result, {col, row})
 {
+    if(col.name == 'system' && row.data.releases)
+    {
+        result[0] = {className: 'overflow-hidden', html: result[0]};
+        result[result.length] = {html:'<span class="label gray-pale rounded-xl clip">' + integratedLabel + '</span>', className:'flex items-end', style:{flexDirection:"column"}};
+    }
+
     if(col.name == 'name')
     {
         if(row.data.marker == 1)

module/projectrelease/ui/browse.html.php

@@ -96,6 +96,7 @@ toolbar
 );
 
 jsVar('markerTitle', $lang->release->marker);
+jsVar('integratedLabel', $lang->release->integratedLabel);
 jsVar('canViewProjectbuild', hasPriv('projectbuild', 'view'));
 
 $cols = $this->loadModel('datatable')->getSetting('projectrelease');

module/release/js/browse.ui.js

@@ -1,5 +1,11 @@
 window.renderCell = function(result, {col, row})
 {
+    if(col.name == 'system' && row.data.releases)
+    {
+        result[0] = {className: 'overflow-hidden', html: result[0]};
+        result[result.length] = {html:'<span class="label gray-pale rounded-xl clip">' + integratedLabel + '</span>', className:'flex items-end', style:{flexDirection:"column"}};
+    }
+
     if(col.name == 'name')
     {
         if(row.data.marker == 1)

module/release/lang/de.php

@@ -136,3 +136,4 @@ $lang->release->markerList[0] = 'No';
 
 $lang->release->failTips        = 'Deployment/Launch Failed';
 $lang->release->versionErrorTip = 'Version number can only contain letters, numbers, hyphens (-), dots (.), and underscores (_).';
+$lang->release->integratedLabel = 'Integrated';

module/release/lang/en.php

@@ -136,3 +136,4 @@ $lang->release->markerList[0] = 'No';
 
 $lang->release->failTips        = 'Deployment/Launch Failed';
 $lang->release->versionErrorTip = 'Version number can only contain letters, numbers, hyphens (-), dots (.), and underscores (_).';
+$lang->release->integratedLabel = 'Integrated';

module/release/lang/fr.php

@@ -136,3 +136,4 @@ $lang->release->markerList[0] = 'No';
 
 $lang->release->failTips        = 'Deployment/Launch Failed';
 $lang->release->versionErrorTip = 'Version number can only contain letters, numbers, hyphens (-), dots (.), and underscores (_).';
+$lang->release->integratedLabel = 'Integrated';

module/release/lang/zh-cn.php

@@ -136,3 +136,4 @@ $lang->release->markerList[0] = '否';
 
 $lang->release->failTips        = '部署/上线失败';
 $lang->release->versionErrorTip = "版本号只能包含大小写英文字母、数字、减号（-）、点（.） 、下划线（_）";
+$lang->release->integratedLabel = '集成';

module/release/ui/browse.html.php

@@ -94,6 +94,7 @@ toolbar
 );
 
 jsVar('markerTitle', $lang->release->marker);
+jsVar('integratedLabel', $lang->release->integratedLabel);
 jsVar('showBranch', $showBranch);
 jsVar('type', $type);
 jsVar('isFromDoc', $isFromDoc);