From b9f7df89f38bfcae49f34894a013eec194844c61 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Tue, 28 May 2024 14:31:01 +0800 Subject: [PATCH] * [bug#50049,done,0.5h,0h] Fix createExecutionModal js error. --- module/productplan/js/browse.ui.js | 4 ++-- module/productplan/ui/browsebykanban.html.php | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/productplan/js/browse.ui.js b/module/productplan/js/browse.ui.js index 6b9ba87d43..040b7830ff 100644 --- a/module/productplan/js/browse.ui.js +++ b/module/productplan/js/browse.ui.js @@ -132,7 +132,7 @@ $(document).off('click', '.batch-btn').on('click', '.batch-btn', function() $(document).on('click', '[data-target="#createExecutionModal"]', function() { - const planID = $(this).closest('.dtable-cell').data('row'); + const planID = $(this).data('plan') ? $(this).data('plan') : $(this).closest('.dtable-cell').data('row'); $('#createExecutionModal [name=planID]').val(planID); const productID = plans[planID].product; @@ -331,7 +331,7 @@ window.buildCardActions = function(item) { let actions = []; - if(item.actionList.includes('createExecution')) actions.push({text: productplanLang.createExecution, icon: 'plus', url: '#createExecutionModal', 'data-toggle': 'modal', 'data-on': 'click', 'data-call': 'getPlanID', 'data-params': 'event', 'data-branch': item.branch, 'data-plan': item.id}); + if(item.actionList.includes('createExecution')) actions.push({text: productplanLang.createExecution, icon: 'plus', url: '#createExecutionModal', 'data-target': '#createExecutionModal', 'data-toggle': 'modal', 'data-on': 'click', 'data-call': 'getPlanID', 'data-params': 'event', 'data-branch': item.branch, 'data-plan': item.id}); if(item.actionList.includes('linkStory')) actions.push({text: productplanLang.linkStory, icon: 'link', url: $.createLink(rawModule, 'view', "planID=" + item.id + "&type=story&orderBy=id_desc&link=true")}); if(item.actionList.includes('linkBug')) actions.push({text: productplanLang.linkBug, icon: 'bug', url: $.createLink(rawModule, 'view', "planID=" + item.id + "&type=bug&orderBy=id_desc&link=true")}); if(item.actionList.includes('edit')) actions.push({text: productplanLang.edit, icon: 'edit', url: $.createLink(rawModule, 'edit', "planID=" + item.id)}); diff --git a/module/productplan/ui/browsebykanban.html.php b/module/productplan/ui/browsebykanban.html.php index 9bb8456d82..239696fa36 100644 --- a/module/productplan/ui/browsebykanban.html.php +++ b/module/productplan/ui/browsebykanban.html.php @@ -50,6 +50,8 @@ else set::items($labelItems) ) : null; +jsVar('plans', $plans); + toolbar ( set::className('w-full justify-end'),