From dd86e47b37e992dd1d49c0be4e77737c1bb5019b Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 12 Jul 2023 16:43:07 +0800 Subject: [PATCH] * Code for task #97061. --- lib/zin/wg/backbtn/v1.php | 2 +- module/productplan/ui/view.html.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/zin/wg/backbtn/v1.php b/lib/zin/wg/backbtn/v1.php index d0c0145ec4..77f2dc5181 100644 --- a/lib/zin/wg/backbtn/v1.php +++ b/lib/zin/wg/backbtn/v1.php @@ -44,7 +44,7 @@ class backBtn extends btn $backs = array( 'task' => 'execution-task,my-work,my-contribute,', - 'story' => 'product-browse,projectstory-story,execution-story,my-work,my-contribute,', + 'story' => 'product-browse,projectstory-story,execution-story,my-work,my-contribute,productplan-view', 'bug' => 'bug-browse,project-bug,my-work,my-contribute,', 'testcase' => 'testcase-browse,project-testcase,my-work,my-contribute,', 'testsuite' => 'testsuite-browse,testsuite-view,', diff --git a/module/productplan/ui/view.html.php b/module/productplan/ui/view.html.php index 76933e99c9..683967cb23 100644 --- a/module/productplan/ui/view.html.php +++ b/module/productplan/ui/view.html.php @@ -216,11 +216,11 @@ detailBody set::footer(array('checkbox', 'toolbar', array('html' => $summary, 'className' => "text-dark"), 'flex', 'pager')), set::footPager ( - usePager(array( + usePager('storyPager', '', array( 'recPerPage' => $storyPager->recPerPage, 'recTotal' => $storyPager->recTotal, 'linkCreator' => helper::createLink('productplan', 'view', "planID={$plan->id}&type=story&orderBy={$orderBy}&link=false¶m={$param}&recTotal={$storyPager->recTotal}&recPerPage={recPerPage}&page={page}") - ), 'storyPager'), + )), ), ) ), @@ -247,11 +247,11 @@ detailBody set::footer(array('checkbox', 'toolbar', array('html' => sprintf($lang->productplan->bugSummary, count($planBugs)), 'className' => "text-dark"), 'flex', 'pager')), set::footPager ( - usePager(array( + usePager('bugPager', '', array( 'recPerPage' => $bugPager->recPerPage, 'recTotal' => $bugPager->recTotal, 'linkCreator' => helper::createLink('productplan', 'view', "planID={$plan->id}&type=bug&orderBy={$orderBy}&link=false¶m={$param}&recTotal={$bugPager->recTotal}&recPerPage={recPerPage}&page={page}") - ), 'bugPager'), + )), ), ) ),