Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
* Fix execution and project linked product prompt issues. See merge request easycorp/zentaopms!536
This commit is contained in:
@@ -124,7 +124,7 @@ function computeEndDate(delta)
|
||||
*/
|
||||
function loadBranches(product)
|
||||
{
|
||||
$('#productsBox select').each(function()
|
||||
$("#productsBox select[name^='products']").each(function()
|
||||
{
|
||||
var $product = $(product);
|
||||
if($product.val() != 0 && $product.val() == $(this).val() && $product.attr('id') != $(this).attr('id') && !multiBranchProducts[$product.val()])
|
||||
@@ -216,8 +216,6 @@ function adjustPlanBoxMargin()
|
||||
}
|
||||
}
|
||||
|
||||
function loadBranch(){}
|
||||
|
||||
/* Auto compute the work days. */
|
||||
$(function()
|
||||
{
|
||||
|
||||
@@ -139,7 +139,7 @@ function loadBranches(product)
|
||||
/* When selecting a product, delete a plan that is empty by default. */
|
||||
$("#planDefault").remove();
|
||||
|
||||
$('#productsBox select').each(function()
|
||||
$("#productsBox select[name^='products']").each(function()
|
||||
{
|
||||
var $product = $(product);
|
||||
if($product.val() != 0 && $product.val() == $(this).val() && $product.attr('id') != $(this).attr('id') && !multiBranchProducts[$product.val()])
|
||||
|
||||
@@ -138,7 +138,7 @@ function setAclList(programID)
|
||||
*/
|
||||
function loadBranches(product)
|
||||
{
|
||||
$('#productsBox select').each(function()
|
||||
$("#productsBox select[name^='products']").each(function()
|
||||
{
|
||||
var $product = $(product);
|
||||
if($product.val() != 0 && $product.val() == $(this).val() && $product.attr('id') != $(this).attr('id') && !multiBranchProducts[$product.val()])
|
||||
|
||||
Reference in New Issue
Block a user