diff --git a/module/product/js/project.ui.js b/module/product/js/project.ui.js index d6154512a4..28a8a7fc49 100644 --- a/module/product/js/project.ui.js +++ b/module/product/js/project.ui.js @@ -17,32 +17,28 @@ window.renderCustomCell = function(result, {col, row}) window.link2Project = function(e) { let $link2Project = $(e.target).closest('#link2Project'); - let selectProjectID = $link2Project.find('#project').val(); + let selectProjectID = $link2Project.find('[name="project"]').val(); let currentProductID = $link2Project.find('#product').val(); let currentBranchID = $link2Project.find('#branch').val(); - console.log('') $.get($.createLink('project', 'ajaxGetLinkedProducts', 'projectID=' + selectProjectID), function(product) { - var products = []; - var branches = []; + let products = []; + let branches = []; + const formData = new FormData(); var linkedProducts = JSON.parse(product); for(var productID in linkedProducts) { for(var branchID in linkedProducts[productID]) { - products.push(productID); - branches.push(branchID); + formData.append('products[]', productID); + formData.append('branch[' + productID + '][]', branchID); } } - products.push(currentProductID); - branches.push(currentBranchID); - - const formData = new FormData(); - formData.append('products', products); - formData.append('branch', branches); + formData.append('products[]', currentProductID); + formData.append('branch[' + currentProductID + '][]', currentBranchID); $.ajaxSubmit({ url: $.createLink('project', 'manageProducts', 'projectID=' + selectProjectID), diff --git a/module/product/ui/project.html.php b/module/product/ui/project.html.php index 87c44e3053..71389bd22f 100644 --- a/module/product/ui/project.html.php +++ b/module/product/ui/project.html.php @@ -72,12 +72,7 @@ modal btn(setClass('primary'), set::id('saveButton'), $lang->save), btn(setClass('default'), set('data-dismiss', 'modal'), $lang->cancel) ), - inputGroup - ( - setClass('pt-2'), - $lang->product->link2Project, - select(set::name('project'), set::items($projects)) - ), + picker(setClass('pt-2'), set::name('project'), set::items($projects)), input(set::type('hidden'), set::name('product'), set::value($product->id)), input(set::type('hidden'), set::name('branch'), set::value($branchID)) ); diff --git a/module/program/js/browse.ui.js b/module/program/js/browse.ui.js index 06c230ec55..c7731a73d4 100644 --- a/module/program/js/browse.ui.js +++ b/module/program/js/browse.ui.js @@ -68,6 +68,7 @@ $(document).off('click', '[data-formaction]').on('click', '[data-formaction]', f window.footerSummary = function(element, checkedIdList) { + if(typeof(checkedIdList) == 'undefined') return {}; if(!checkedIdList.length) return {html: element.options.customData.pageSummary, className: 'text-dark'}; const dtable = zui.DTable.query($('#projectviews'));