Merge branch 'master_liuhong_26203' into 'master'

* Fix bug#26203. See merge request easycorp/zentaopms!5046
2022-08-22 07:24:08 +00:00
parent 295c4bf8b7 d36e4d56a8
commit fbc06ff2e3
1 changed files with 1 additions and 3 deletions
@@ -237,13 +237,11 @@ class projectrelease extends control
            ->beginIF($type == 'story')->orderBy($orderBy)->fi()
            ->page($storyPager)
            ->fetchAll('id');
+        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story');

        $stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in(array_keys($stories))->andWhere('branch')->eq($release->branch)->fetchPairs('story', 'stage');
        foreach($stages as $storyID => $stage) $stories[$storyID]->stage = $stage;

-
-        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story');
-
        $bugPager = new pager($type == 'bug' ? $recTotal : 0, $recPerPage, $type == 'bug' ? $pageID : 1);
        $bugs = $this->dao->select('*')->from(TABLE_BUG)->where('id')->in($release->bugs)->andWhere('deleted')->eq(0)
            ->beginIF($type == 'bug')->orderBy($orderBy)->fi()