diff --git a/module/execution/js/task.js b/module/execution/js/task.js index 032f77cbbe..013627478d 100644 --- a/module/execution/js/task.js +++ b/module/execution/js/task.js @@ -9,7 +9,7 @@ $(function() $td.find('a').eq(0).css('max-width', $td.width() - labelWidth - 60); }); - toggleFold('#projectTaskForm', unfoldTasks, executionID, 'project'); + toggleFold('#executionTaskForm', unfoldTasks, executionID, 'project'); adjustTableFooter(); $('body').on('click', '#toggleFold', adjustTableFooter); diff --git a/module/product/model.php b/module/product/model.php index 9f78b9598a..25256181bd 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1592,7 +1592,11 @@ class productModel extends model $hourList = $this->loadModel('project')->computerProgress($latestExecutionList); - $releaseList = $this->dao->select('id,product,name,marker')->from(TABLE_RELEASE)->where('product')->in(array_keys($productList))->fetchGroup('product', 'id'); + $releaseList = $this->dao->select('id,product,name,marker')->from(TABLE_RELEASE) + ->where('product')->in(array_keys($productList)) + ->andWhere('deleted')->eq('0') + ->andWhere('status')->eq('normal') + ->fetchGroup('product', 'id'); return array('programList' => $programList, 'productList' => $productList, 'planList' => $planList, 'projectList' => $projectList, 'executionList' => $executionList, 'projectProduct' => $projectProduct, 'projectLatestExecutions' => $projectLatestExecutions, 'hourList' => $hourList, 'releaseList' => $releaseList); }