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 09:05:19 +08:00
parent 8ce3d4de2a 907f16d5ff
commit ab108bd178
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/model.php
+1 -1
View File
@@ -141,7 +141,7 @@ class branchModel extends model
{
if($products[$branch->product]->type == 'normal')
{
$branchGroups[$branch->product][0] = '';
if(strpos($params, 'ignoreNormal') === false) $branchGroups[$branch->product][0] = '';
}
else
{
module/execution/control.php
+1 -1
View File
@@ -2236,7 +2236,7 @@ class execution extends control
$this->view->execution = $execution;
$this->view->linkedProducts = $linkedProducts;
$this->view->unmodifiableProducts = $unmodifiableProducts;
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($allProducts), '', $linkedBranches);
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($allProducts), 'ignoreNormal', $linkedBranches);
$this->display();
}
module/project/control.php
+1 -1
View File
@@ -1589,7 +1589,7 @@ class project extends control
$this->view->allProducts = $allProducts;
$this->view->linkedProducts = $linkedProducts;
$this->view->unmodifiableProducts = $unmodifiableProducts;
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($allProducts), '', $linkedBranches);
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($allProducts), 'ignoreNormal', $linkedBranches);
$this->display();
}
module/upgrade/js/mergeprogram.js
+17 -10
View File
@@ -107,6 +107,14 @@ $(function()
$('#source .cell').height($('#source').height());
$('#programBox .cell').height($('#programBox').height() - 20);
programBegin = $('.programParams #begin').val();
programEnd = $('.programParams #end').val();
setProgramBegin(programBegin);
setProgramEnd(programEnd);
setProjectPM();
setProgramByProduct($(':checkbox:checked[data-productid]'));
/* Select all product line events. */
$('#checkAllLines').click(function()
{
@@ -131,6 +139,9 @@ $(function()
$('#programName').val('');
}
setProgramBegin(programBegin);
setProgramEnd(programEnd);
/* If the project is checked, the relevant form will be displayed according to the selected mode. */
hiddenProject();
})
@@ -155,6 +166,9 @@ $(function()
$('[name^=sprints]').prop('checked', false);
$('#programName').val('');
}
setProgramBegin(programBegin);
setProgramEnd(programEnd);
hiddenProject();
})
@@ -178,22 +192,12 @@ $(function()
$('[name^=sprints]').prop('checked', false);
$('#programName').val('');
}
programBegin = $('.programParams #begin').val();
programEnd = $('.programParams #end').val();
setProgramBegin(programBegin);
setProgramEnd(programEnd);
hiddenProject();
})
programBegin = $('.programParams #begin').val();
programEnd = $('.programParams #end').val();
setProgramBegin(programBegin);
setProgramEnd(programEnd);
setProjectPM();
setProgramByProduct($(':checkbox:checked[data-productid]'));
/* Select a product line event. */
$('[name^=productLines]').change(function()
{
@@ -233,6 +237,9 @@ $(function()
if(lineNum > checkedLineNum) checked = false;
$('#checkAllLines').prop('checked', checked);
setProgramBegin(programBegin);
setProgramEnd(programEnd);
/* If the project is checked, the relevant form will be displayed according to the selected mode. */
hiddenProject();
})