From 679f2641aaffe0a1d22ccefa2a9834547d2ae4ae Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Wed, 16 Nov 2022 17:19:43 +0800 Subject: [PATCH] * Fallback code for bug#29896. --- module/program/model.php | 1 - module/project/js/create.js | 2 -- 2 files changed, 3 deletions(-) diff --git a/module/program/model.php b/module/program/model.php index 9d5ff89348..50948a015c 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -88,7 +88,6 @@ class programModel extends model $dao = $this->dao->select('id, name, program')->from(TABLE_PRODUCT) ->where('deleted')->eq(0) ->andWhere('vision')->eq($this->config->vision) - ->beginIF($programID !== '')->andWhere('program')->eq($programID)->fi() ->beginIF($shadow !== 'all')->andWhere('shadow')->eq((int)$shadow)->fi() ->beginIF($mode == 'assign')->andWhere('program')->eq($programID)->fi() ->beginIF(strpos($status, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi() diff --git a/module/project/js/create.js b/module/project/js/create.js index 2646ba755d..f140841f41 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -160,10 +160,8 @@ function setParentProgram(parentProgram) var selectedProduct = $(this).find('[name^=products]').val(); var selectedBranch = $(this).find('[name^=branch]').val(); var selectedPlan = $('#plan' + index ).find('[name^=plans]').val(); - var newProductHtml = $(this).find('span.input-group-addon'); $(this).html(productSelectHtml); - $(this).append(newProductHtml); $(this).find('[name^=products]').attr('name', 'products[' + index + ']').attr('id', 'products' + index).attr('data-branch', selectedBranch).attr('data-plan', selectedPlan); $(this).find('[name^=products]').val(selectedProduct).chosen().change(); });