Merge branch dev/bug-64400 of zentao/zentaopms (#10940)
This commit is contained in:
@@ -324,7 +324,7 @@ class branch extends control
|
||||
$targetBranch = $this->branch->mergeBranch($productID, $branchIdList, $postData);
|
||||
if(dao::isError()) return $this->sendError(dao::getError());
|
||||
|
||||
$this->loadModel('action')->create('branch', $targetBranch, 'MergedBranch', '', implode(',', $mergedBranches));
|
||||
$this->loadModel('action')->create('branch', $targetBranch, 'MergedBranch', '', implode(',', array_keys($mergedBranches)));
|
||||
if(dao::isError()) return $this->sendError(dao::getError());
|
||||
}
|
||||
return $this->sendSuccess(array('load' => true, 'closeModel' => true));
|
||||
|
||||
Reference in New Issue
Block a user