diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js index 09a4c442a3..888680cbcd 100644 --- a/module/upgrade/js/mergeprogram.js +++ b/module/upgrade/js/mergeprogram.js @@ -490,6 +490,15 @@ $(function() return false; } }) + + /* If the product line is selected, the product and project are selected by default. */ + $('[id^=productLines]').each(function() + { + if($(this).prop('checked')) + { + $('[data-line=' + $(this).val() +']').prop('checked', true); + } + }) }) $('[name^=products]').change(function() diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 7ecb09415a..22b975ee00 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -4246,7 +4246,7 @@ class upgradeModel extends model public function createProgram($productIdList = array(), $projectIdList = array()) { $this->app->loadLang('program'); - $data = fixer::input('post')->get(); + $data = fixer::input('post')->get(); $account = isset($this->app->user->account) ? $this->app->user->account : ''; if(isset($data->newProgram))