Merge branch 'sprint/169_songchenxuan_15784' into 'sprint/169'

Sprint/169 songchenxuan 15784 See merge request easycorp/zentaopms!267
2021-11-01 09:22:43 +00:00
parent 771de2c02e 1c4ceda168
commit 67743d72d9
1 changed files with 9 additions and 1 deletions
@@ -402,7 +402,15 @@ class bug extends control

            if($this->app->tab == 'execution')
            {
-                $location = $this->session->bugList ? $this->session->bugList : $this->createLink('execution', 'bug', "executionID={$output['executionID']}");
+	    	if(!preg_match("/(m=|\/)execution(&f=|-)bug(&|-|\.)?/", $this->session->bugList))
+	        {
+		    $location = $this->session->bugList;
+		}
+		else
+		{
+		    $executionID = $this->post->execution ? $this->post->execution : $output['executionID'];
+	            $location    = $this->createLink('execution', 'bug', "executionID=$executionID");
+		}
            }
            elseif($this->app->tab == 'project')
            {