From 78940a54985ffdc830172616a2a74e48b7535e42 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 25 Mar 2021 14:58:11 +0800 Subject: [PATCH] * Fix bug. --- module/common/lang/menu.php | 4 ++-- module/common/model.php | 11 ++++++----- module/execution/control.php | 6 ++---- module/execution/view/bug.html.php | 5 +++-- module/product/control.php | 6 +++++- module/project/view/bug.html.php | 5 +++-- module/projectstory/control.php | 2 -- 7 files changed, 21 insertions(+), 18 deletions(-) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index e6fe0ff820..df1c0b0ecb 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -343,8 +343,8 @@ $lang->qa->menu->testtask['subMenu'] = new stdclass(); $lang->qa->menu->testtask['subMenu']->testtask = array('link' => "{$lang->testtask->common}|testtask|browse|productID=%s", 'subModule' => 'testtask', 'alias' => 'linkcase,cases,start,close,batchrun,groupcase,report,importunitresult'); $lang->qa->menu->testtask['subMenu']->report = array('link' => "{$lang->testreport->common}|testreport|browse|productID=%s", 'subModule' => 'testreport'); -$lang->qa->menu->automation['subMenu'] = new stdclass(); -$lang->qa->menu->automation['subMenu']->browse = array('link' => "{$lang->intro}|automation|browse|productID=%s", 'alias' => ''); +// $lang->qa->menu->automation['subMenu'] = new stdclass(); +// $lang->qa->menu->automation['subMenu']->browse = array('link' => "{$lang->intro}|automation|browse|productID=%s", 'alias' => ''); // $lang->qa->menu->automation['subMenu']->framework = array('link' => '框架|automation|framework|productID=%s', 'alias' => ''); // $lang->qa->menu->automation['subMenu']->data = array('link' => '数据|automation|date|productID=%s', 'alias' => ''); // $lang->qa->menu->automation['subMenu']->interface = array('link' => '接口|automation|interface|productID=%s', 'alias' => ''); diff --git a/module/common/model.php b/module/common/model.php index b83bb4581b..a66c61bdf3 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1490,7 +1490,8 @@ EOD; $id = $object->$key; $objectList[$id] = $object; } - $this->session->set($objectIdListKey, array('sql' => $sql, 'objectList' => $objectList)); + + $this->session->set($objectIdListKey, array('sql' => $sql, 'objectList' => $objectList), $this->app->openApp); $existsObjectList = $this->session->$objectIdListKey; } @@ -1549,8 +1550,8 @@ EOD; $queryCondition = trim($queryCondition); if(empty($queryCondition)) $queryCondition = "1=1"; - $this->session->set($objectType . 'QueryCondition', $queryCondition); - $this->session->set($objectType . 'OnlyCondition', $onlyCondition); + $this->session->set($objectType . 'QueryCondition', $queryCondition, $this->app->openApp); + $this->session->set($objectType . 'OnlyCondition', $onlyCondition, $this->app->openApp); /* Set the query condition session. */ $orderBy = explode(' ORDER BY ', $sql); @@ -1561,8 +1562,8 @@ EOD; $orderBy = $orderBy[0]; if($onlyCondition) $orderBy = str_replace('t1.', '', $orderBy); } - $this->session->set($objectType . 'OrderBy', $orderBy); - $this->session->set($objectType . 'BrowseList', array()); + $this->session->set($objectType . 'OrderBy', $orderBy, $this->app->openApp); + $this->session->set($objectType . 'BrowseList', array(), $this->app->openApp); } /** diff --git a/module/execution/control.php b/module/execution/control.php index 3a06f25f7c..361d04de31 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -186,9 +186,7 @@ class execution extends control /* Save to session. */ $uri = $this->app->getURI(true); - $this->app->session->set('taskList', $uri, 'execution'); - $this->app->session->set('storyList', $uri, 'product'); - $this->app->session->set('executionList', $uri, 'execution'); + $this->app->session->set('taskList', $uri, 'execution'); /* Process the order by field. */ if(!$orderBy) $orderBy = $this->cookie->executionTaskOrder ? $this->cookie->executionTaskOrder : 'status,id_desc'; @@ -720,7 +718,7 @@ class execution extends control } /* Save session. */ - $this->app->session->set('storyList', $this->app->getURI(true), 'product'); + $this->app->session->set('storyList', $this->app->getURI(true), 'execution'); /* Process the order by field. */ if(!$orderBy) $orderBy = $this->cookie->executionStoryOrder ? $this->cookie->executionStoryOrder : 'pri'; diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php index e1970283e3..237622c1bb 100644 --- a/module/execution/view/bug.html.php +++ b/module/execution/view/bug.html.php @@ -77,11 +77,12 @@ id"); ?> - id => ''), '', $arrtibute) . html::a(helper::createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id));?> + id => ''), '', $arrtibute) . html::a($viewLink, sprintf('%03d', $bug->id), '', "data-app={$this->app->openApp}");?> id);?> @@ -94,7 +95,7 @@ pri?>' title='bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> - createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?> + title, null, "style='color: $bug->color' data-app={$this->app->openApp}");?> openedBy, $bug->openedBy);?> bug->printAssignedHtml($bug, $users);?> resolvedBy, $bug->resolvedBy);?> diff --git a/module/product/control.php b/module/product/control.php index 1bf88f2bd9..7d4b90017a 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -122,7 +122,11 @@ class product extends control $productID = $this->app->openApp != 'project' ? $this->product->saveState($productID, $this->products) : $productID; if($this->app->openApp == 'product') $this->product->setMenu($productID, $branch); - if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($projectID); + if($this->app->openApp == 'project') + { + $this->session->set('storyList', $this->app->getURI(true), 'project'); + $this->loadModel('project')->setMenu($projectID); + } /* Lower browse type. */ $browseType = strtolower($browseType); diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index f8ce2915f3..1402c0ba92 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -77,11 +77,12 @@ id"); ?> - id => ''), '', $arrtibute) . html::a(helper::createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id));?> + id => ''), '', $arrtibute) . html::a($viewLink, sprintf('%03d', $bug->id), '', "data-app={$this->app->openApp}");?> id);?> @@ -94,7 +95,7 @@ pri?>' title='bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> - createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?> + title, null, "style='color: $bug->color' data-app={$this->app->openApp}");?> openedBy, $bug->openedBy);?> bug->printAssignedHtml($bug, $users);?> resolvedBy, $bug->resolvedBy);?> diff --git a/module/projectstory/control.php b/module/projectstory/control.php index 802b862b41..d075e37228 100644 --- a/module/projectstory/control.php +++ b/module/projectstory/control.php @@ -45,8 +45,6 @@ class projectStory extends control */ public function story($projectID = 0, $productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - $this->session->set('storyList', $this->app->getURI(true), 'project'); - echo $this->fetch('product', 'browse', "productID=$productID&branch=$branch&browseType=$browseType¶m=$param&storyType=$storyType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID"); }