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

Merge branch 'master' into 'feedback_1796'

Browse Source 
# Conflicts:
#   module/testcase/js/browse.js
This commit is contained in:
曾刚
2022-12-30 05:45:51 +00:00
parent 5aa6762e18 913eb916f2
commit c6cfa19dd9
1347 changed files with 944985 additions and 1063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/execution/model.php
View File

@@ -338,7 +338,7 @@ class executionModel extends model
$multipleProducts = $this->loadModel('product')->getMultiBranchPairs();
foreach($_POST['products'] as $index => $productID)
{
if(isset($multipleProducts[$productID]) and empty($_POST['branch'][$index]))
if(isset($multipleProducts[$productID]) and !isset($_POST['branch'][$index]))
{
dao::$errors[] = $this->lang->project->emptyBranch;
return false;
@@ -534,7 +534,7 @@ class executionModel extends model
$multipleProducts = $this->loadModel('product')->getMultiBranchPairs();
foreach($_POST['products'] as $index => $productID)
{
if(isset($multipleProducts[$productID]) and empty($_POST['branch'][$index]))
if(isset($multipleProducts[$productID]) and !isset($_POST['branch'][$index]))
{
dao::$errors[] = $this->lang->project->emptyBranch;
return false;