From ace844a0504ec2b5bdccb2877dbc38f49ad86574 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Fri, 28 Jul 2023 15:32:00 +0800 Subject: [PATCH] * Adjust switchProject method. --- module/block/js/executionstatisticblock.ui.js | 8 -------- module/block/ui/executionstatisticblock.html.php | 5 +++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/module/block/js/executionstatisticblock.ui.js b/module/block/js/executionstatisticblock.ui.js index 2e005e4aa2..3ce5e74de9 100644 --- a/module/block/js/executionstatisticblock.ui.js +++ b/module/block/js/executionstatisticblock.ui.js @@ -12,14 +12,6 @@ function initNavTabs() }) } -window.switchProject = function(event) -{ - const block = $(event.target).parent().data('block'); - const params = $(event.target).parent().data('param'); - const url = $.createLink('block', 'printBlock', 'blockID=' + block + '¶ms=' + params); - loadPage({url, selector: '#executionstatistic-block-' + block, success: initNavTabs}); -} - function switchNav(event) { var isPrev = $(event.target).closest('.nav-item').hasClass('nav-prev'); diff --git a/module/block/ui/executionstatisticblock.html.php b/module/block/ui/executionstatisticblock.html.php index 92b55fbd36..6f1981861d 100644 --- a/module/block/ui/executionstatisticblock.html.php +++ b/module/block/ui/executionstatisticblock.html.php @@ -383,10 +383,11 @@ $getExecutionInfo = function(array $executions, string $blockNavID, bool $longBl }; $projectItems = array(); -$projectItems[] = array('text' => $lang->block->executionstatistic->allProject, 'data-block' => $block->id, 'data-param' => helper::safe64Encode("project=0"), 'data-on' => 'click', 'data-call' => 'switchProject', 'data-params' => 'event'); +$projectItems[] = array('text' => $lang->block->executionstatistic->allProject, 'url' => createLink('block', 'printBlock', "blockID={$block->id}"), 'data-load' => 'target', 'data-selector' => "#executionstatistic-block-{$block->id}", 'data-partial' => true); foreach($projects as $projectID => $projectName) { - $projectItems[] = array('text' => $projectName, 'data-block' => $block->id, 'data-param' => helper::safe64Encode("project={$projectID}"), 'data-on' => 'click', 'data-call' => 'switchProject', 'data-params' => 'event'); + $url = createLink('block', 'printBlock', "blockID={$block->id}¶ms=" . helper::safe64Encode("project={$projectID}")); + $projectItems[] = array('text' => $projectName, 'url' => $url, 'data-load' => 'target', 'data-selector' => "#executionstatistic-block-{$block->id}", 'data-partial' => true); } $blockNavCode = 'nav-' . uniqid();