Merge branch 'zenops_46_tanghucheng' into zenops_46

This commit is contained in:
zhaoke
2022-12-21 07:11:55 +00:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -433,7 +433,7 @@ class testcase extends control
/* Use this session link, when the tab is not QA, a session of the case list exists, and the session is not from the Dynamic page. */
$useSession = ($this->app->tab != 'qa' and $this->session->caseList and strpos($this->session->caseList, 'dynamic') === false);
$locateLink = $this->app->tab == 'project' ? $this->createLink('project', 'testcase', "projectID={$this->session->project}") : $this->createLink('testcase', 'browse', "productID={$this->post->product}&branch={$this->post->branch}&browseType=all&param=0&orderBy=id_desc");
$locateLink = $this->app->tab == 'project' ? $this->createLink('project', 'testcase', "projectID={$this->session->project}") : $this->createLink('testcase', 'browse', "productID={$this->post->product}&branch={$this->post->branch}");
$response['locate'] = $useSession ? $this->session->caseList : $locateLink;
return $this->send($response);
}
+1 -1
View File
@@ -13,7 +13,7 @@
.btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
.btn-group button.dropdown-toggle.btn-primary {padding:6px;}
.body-modal #mainMenu>.btn-toolbar {width: auto;}
#mainMenu .pull-left .checkbox-primary {margin-top: 5px;}
#mainMenu .pull-left .checkbox-primary {margin-top: 6px;}
#mainMenu .dividing-line {width: 1px; height: 16px; display: inline-block; background: #D8DBDE; margin: 7px 8px 0 0; float: left;}
#byTypeTab li.split{border-top: 1px solid #eee;}
</style>