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

* Adjust the issue of merge branch.

Browse Source
This commit is contained in:
hufangzhou
2021-12-22 08:50:42 +08:00
parent 9743ebbb92
commit 10c2f33c2b
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/control.php
+1 -1
View File
@@ -45,7 +45,7 @@ class branch extends control
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->product = $this->product->getById($productID);
$this->view->branchPairs = $this->branch->getPairs($productID);
$this->view->branchPairs = $this->branch->getPairs($productID, 'active');
$this->display();
}
module/branch/js/manage.js
+8 -5
View File
@@ -47,13 +47,16 @@ $(function()
$("input[id*='branchIDList']").change(function()
{
if($(this).prop('checked') && $(this).closest('tr').data('status') === 'closed')
$("input[id*='branchIDList']").each(function()
{
$("a[href='#mergeBranch']").hide();
return false;
}
if($(this).prop('checked') && $(this).closest('tr').data('status') === 'closed')
{
$("a[href='#mergeBranch']").hide();
return false;
}
$("a[href='#mergeBranch']").show();
$("a[href='#mergeBranch']").show();
})
});
$('#createBranch').change(function()