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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
wangyidong
2021-07-20 11:30:23 +08:00
parent 5377eef475 19b3b75b2e
commit d687dbb8f0
4 changed files with 32 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update15.0.3.sql
-1
View File
@@ -11,4 +11,3 @@ RENAME TABLE `zt_jenkins` TO `zt_pipeline`;
ALTER TABLE `zt_relation` DROP INDEX `relation`;
ALTER TABLE `zt_relation` ADD UNIQUE INDEX `relation`(`product`, `relation`, `AType`, `BType`, `AID`, `BID`);
module/build/model.php
+1 -1
View File
@@ -238,7 +238,7 @@ class buildModel extends model
$selectedBuilds = array();
if(strpos($params, 'noempty') === false) $sysBuilds = array('' => '');
if(strpos($params, 'notrunk') === false) $sysBuilds = $sysBuilds + array('trunk' => $this->lang->trunk);
if($buildID != 0) $selectedBuilds = $this->dao->select('id, name')->from(TABLE_BUILD)->where('id')->in($buildID)->fetchPairs();
if($buildID != 0) $selectedBuilds = $this->dao->select('id, name')->from(TABLE_BUILD)->where('id')->in($buildID)->andWhere('execution')->eq($executionID)->fetchPairs();
$executionBuilds = $this->dao->select('t1.id, t1.name, t1.execution, t2.status as executionStatus, t3.id as releaseID, t3.status as releaseStatus, t4.name as branchName')->from(TABLE_BUILD)->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id')
module/product/control.php
+1 -1
View File
@@ -451,7 +451,7 @@ class product extends control
if($this->config->systemMode == 'new')
{
/* Change the projects set of the program. */
if(($_POST['program'] != $product->program) and $singleLinkProjects or $multipleLinkProjects)
if(($_POST['program'] != $product->program) and ($singleLinkProjects or $multipleLinkProjects))
{
$this->product->updateProjects($productID, $singleLinkProjects, $multipleLinkProjects);
}
module/upgrade/js/mergeprogram.js
+30 -45
View File
@@ -105,11 +105,7 @@ $(function()
$('#checkAllLines').prop('checked', checkedLines);
}
var checkAllLines = true;
var lineNum = $("[id^='productLines'").length;
var checkedLineNum = $("[id^='productLines']:checked").length;
if(lineNum > checkedLineNum) checkAllLines = false;
var checkAllLines = isSelectAll(0, 'line');
$("[id='checkAllLines']").prop('checked', checkAllLines);
setProgramBegin(programBegin);
@@ -166,18 +162,22 @@ $(function()
var lineID = $('li.currentPage').attr('lineid');
if($(this).is(':checked'))
{
$('#checkAllProjects').prop('checked', true);
$('#programName').val($('.main-row .side-col .nav li.currentPage div a').text());
if($('[id^=productLines]').length > 0)
{
$('[data-line=' + lineID + ']').prop('checked', true);
$("[id^='productLines\[" + lineID + "\]']").prop('checked', true);
var projectNum = $("[id^='sprints\[" + lineID + "\]']").length;
}
else
{
$('[name^=products]').prop('checked', true);
$('[name^=sprints]').prop('checked', true);
var projectNum = $("[id^='sprints']").length;
}
if(projectNum !== 0) $('#checkAllProjects').prop('checked', true);
}
else
{
@@ -194,6 +194,10 @@ $(function()
}
$('#programName').val('');
}
var checkAllLines = isSelectAll(0, 'line');
$("[id='checkAllLines']").prop('checked', checkAllLines);
setProgramBegin(programBegin);
setProgramEnd(programEnd);
@@ -234,6 +238,9 @@ $(function()
$('[name^=sprints]').prop('checked', false);
}
}
var checkAllLines = isSelectAll(0, 'line');
$("[id='checkAllLines']").prop('checked', checkAllLines);
setProgramBegin(programBegin);
setProgramEnd(programEnd);
@@ -272,11 +279,7 @@ $(function()
}
/* Determine whether all product line buttons are selected. */
var checked = true;
var lineNum = $("[id^='productLines'").length;
var checkedLineNum = $("[id^='productLines']:checked").length;
if(lineNum > checkedLineNum) checked = false;
var checked = isSelectAll(0, 'line');
$('#checkAllLines').prop('checked', checked);
setProgramBegin(programBegin);
@@ -367,25 +370,13 @@ $(function()
setProjectPM();
/* Determine whether products and projects are selected. */
if($('#checkAllLines').is(':checked'))
if($(this).closest("li").find('[id^=productLines]').prop('checked'))
{
$('#checkAllProducts').prop('checked', true);
$('#checkAllProjects').prop('checked', true);
$('[name^=productLines]').prop('checked', true);
$('[name^=products]').prop('checked', true);
$('[name^=sprints]').prop('checked', true);
}
else if($(this).closest("li").find('[id^=productLines]').prop('checked'))
{
var productLine = $('.nav li.active').attr('lineid');
var objectNum = $('[data-line='+ productLine +']').length;
var checkedObjectNum = $('[data-line='+ productLine +']:checked').length;
if(objectNum == checkedObjectNum)
{
$('#checkAllProducts').prop('checked', true);
$('#checkAllProjects').prop('checked', true);
$('[data-line=' + productLine + ']').prop('checked', true);
}
var productLine = $('.nav li.currentPage').attr('lineid');
var checkedProduct = isSelectAll(productLine, 'product');
var checkedProject = isSelectAll(productLine, 'project');
$('#checkAllProducts').prop('checked', checkedProduct);
$('#checkAllProjects').prop('checked', checkedProject);
}
else
{
@@ -418,19 +409,12 @@ $(function()
}
$("[id^='productLines\[" + lineID + "\]']").prop('checked', checkedLine);
var checkAllLines = true;
var lineNum = $("[id^='productLines'").length;
var checkedLineNum = $("[id^='productLines']:checked").length;
if(lineNum > checkedLineNum) checkAllLines = false;
var checkAllLines = isSelectAll(0, 'line');
$("[id='checkAllLines']").prop('checked', checkAllLines);
}
else if($('[id^=products]').length > 0)
{
var productNum = $("[id^='products'").length;
var checkedProductNum = $("[id^='products']:checked").length;
if(productNum > checkedProductNum) checked = false;
checked = isSelectAll(0, 'product');
}
$('#checkAllProducts').prop('checked', checked);
@@ -505,11 +489,7 @@ $(function()
}
$("[id^='productLines\["+ lineID +"\]").prop('checked', checkedLine);
var checkAllLines = true;
var lineNum = $("[id^='productLines'").length;
var checkedLineNum = $("[id^='productLines']:checked").length;
if(lineNum > checkedLineNum) checkAllLines = false;
var checkAllLines = isSelectAll(0, 'line');
$("[id='checkAllLines']").prop('checked', checkAllLines);
}
else if($('[id^=products]').length > 0)
@@ -1106,7 +1086,7 @@ function getProgramStatus(objectType, objectID)
* @param int lineID
* @param string type
* @access public
* @return void
* @return bool
*/
function isSelectAll(lineID = 0, type = 'product')
{
@@ -1136,7 +1116,12 @@ function isSelectAll(lineID = 0, type = 'product')
var objectNum = $("[id^='products']").length;
var checkedObjectNum = $("[id^='products']:checked").length;
}
else if(type = 'line')
{
var objectNum = $("[id^='productLines'").length;
var checkedObjectNum = $("[id^='productLines']:checked").length;
}
}
if(objectNum > checkedObjectNum) checked = false;
if(objectNum > checkedObjectNum || objectNum == 0) checked = false;
return checked;
}