diff --git a/config/filter.php b/config/filter.php index e884bb0177..f6dbdb6351 100755 --- a/config/filter.php +++ b/config/filter.php @@ -340,7 +340,7 @@ $filter->execution->story->cookie['storyModuleParam'] = 'int'; $filter->execution->story->cookie['storyProductParam'] = 'int'; $filter->execution->story->cookie['storyBranchParam'] = 'int'; $filter->execution->story->cookie['executionStoryOrder'] = 'code'; -$filter->execution->export->cookie['checkedItem'] = 'reg::checked'; +$filter->execution->export->cookie['checkedItem'] = 'reg::paramValue'; $filter->execution->kanban->cookie['taskToOpen'] = 'int'; $filter->execution->all->cookie['showExecutionBatchEdit'] = 'int'; $filter->execution->tree->cookie['showStory'] = 'int'; diff --git a/module/execution/control.php b/module/execution/control.php index cb93c00763..32ff02d3aa 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2936,7 +2936,7 @@ class execution extends control if($this->post->exportType == 'selected') { $checkedItem = $this->cookie->checkedItem; - if(strpos(",$checkedItem,", ",{$execution->id},") === false) unset($executionStats[$i]); + if(strpos(",$checkedItem,", ",pid{$execution->id},") === false) unset($executionStats[$i]); } } diff --git a/module/execution/js/all.ui.js b/module/execution/js/all.ui.js index ac82a4f357..be340f9c43 100644 --- a/module/execution/js/all.ui.js +++ b/module/execution/js/all.ui.js @@ -16,13 +16,6 @@ $(document).off('click','.batch-btn').on('click', '.batch-btn', function() { postAndLoadPage(url, form); } -}).off('click', '#actionBar .export').on('click', '#actionBar .export', function() -{ - const dtable = zui.DTable.query($('#table-execution-all')); - const checkedList = dtable.$.getChecks(); - if(!checkedList.length) return; - - $.cookie.set('checkedItem', checkedList, {expires:config.cookieLife, path:config.webRoot}); }); const today = zui.formatDate(new Date(), 'yyyy-MM-dd');