From 8106da9fa71803a746638fdbc0ff33653a33eff0 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 10 Jul 2024 15:10:09 +0800 Subject: [PATCH] * [task#122674,done,2h,0h] Filter out BRs and URs that have been closed after filtering those with open tags. --- module/product/model.php | 9 ++++++++- module/product/test/model/getstories.php | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/module/product/model.php b/module/product/model.php index 60e31b3bd8..c24ab46f51 100755 --- a/module/product/model.php +++ b/module/product/model.php @@ -663,7 +663,14 @@ class productModel extends model { $unclosedStatus = $this->lang->story->statusList; unset($unclosedStatus['closed']); - return $this->story->getProductStories($productID, $branch, $modules, array_keys($unclosedStatus), $type, $sort, true, '', $pager); + $stories = $this->story->getProductStories($productID, $branch, $modules, array_keys($unclosedStatus), $type, $sort, true, '', $pager); + foreach($stories as $storyID => $story) + { + if($story->type != 'story' && $story->stage == 'closed') unset($stories[$storyID]); + } + $this->app->loadClass('pager', true); + $pager = new pager(count($stories), $pager->recPerPage, $pager->pageID); + return $stories ? current(array_chunk($stories, $pager->recPerPage, true)) : array(); } /* Set default function called, when browseType is (draftstory, activestory, changingstory, reviewingstory, closedstory, developingstory, launchedstory). */ diff --git a/module/product/test/model/getstories.php b/module/product/test/model/getstories.php index fb7adce453..1ceac98421 100755 --- a/module/product/test/model/getstories.php +++ b/module/product/test/model/getstories.php @@ -35,6 +35,7 @@ cid=0 include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/lib/product.unittest.class.php'; +zenData('product')->gen(5); zenData('story')->gen(100); $productIDList = array(1, 2, 3, 4, 5, 1000001);