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

* Fix bug #28928, #28930.

Browse Source
This commit is contained in:
daitingting
2022-10-28 06:09:33 +00:00
parent 9f18188062
commit 0bacaf044c
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/edit.js
+2 -2
View File
@@ -62,12 +62,12 @@ $(function()
{
if($.inArray(lastBranch, unmodifiableBranches) != -1)
{
if(linkedStoryIDList[last][lastBranch]) bootbox.alert(tip.replace('%s', linkedStoryIDList[last][lastBranch]));
if(linkedStoryIDList[last][lastBranch]) bootbox.alert(unLinkProductTip.replace("%s", branchGroups[last][lastBranch]));
}
}
else
{
bootbox.alert(tip.replace('%s', linkedStoryIDList[last][0]));
bootbox.alert(unLinkProductTip.replace("%s", allProducts[last]));
}
}
});
module/execution/js/manageproducts.js
+2 -2
View File
@@ -23,12 +23,12 @@ $(function()
if($.inArray(branchID, unmodifiableBranches) != -1 && linkedStoryIDList[productID][branchID])
{
bootbox.alert(tip.replace('%s', linkedStoryIDList[productID][branchID]));
bootbox.alert(unLinkProductTip.replace("%s", branchGroups[productID][branchID]));
}
}
else
{
bootbox.alert(tip.replace('%s', linkedStoryIDList[productID][0]));
bootbox.alert(unLinkProductTip.replace("%s", allProducts[productID]));
}
}
});
module/execution/view/edit.html.php
+3 -1
View File
@@ -227,6 +227,8 @@
<?php js::set('unmodifiableBranches', $unmodifiableBranches)?>
<?php js::set('linkedStoryIDList', $linkedStoryIDList)?>
<?php js::set('multiBranchProducts', $multiBranchProducts);?>
<?php js::set('tip', $lang->execution->notAllowRemoveProducts);?>
<?php js::set('confirmSync', $lang->execution->confirmSync);?>
<?php js::set('allProducts', $allProducts);?>
<?php js::set('branchGroups', $branchGroups);?>
<?php js::set('unLinkProductTip', $lang->project->unLinkProductTip);?>
<?php include '../../common/view/footer.html.php';?>
module/execution/view/manageproducts.html.php
+5 -3
View File
@@ -12,9 +12,11 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php js::set('unmodifiableProducts',$unmodifiableProducts);?>
<?php js::set('unmodifiableBranches', $unmodifiableBranches)?>
<?php js::set('linkedStoryIDList', $linkedStoryIDList)?>
<?php js::set('tip', $lang->execution->notAllowRemoveProducts);?>
<?php js::set('unmodifiableBranches', $unmodifiableBranches);?>
<?php js::set('linkedStoryIDList', $linkedStoryIDList);?>
<?php js::set('allProducts', $allProducts);?>
<?php js::set('branchGroups', $branchGroups);?>
<?php js::set('unLinkProductTip', $lang->project->unLinkProductTip);?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->execution->manageProducts;?></span></span>