test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
fit2-zhao 2020-12-16 15:31:15 +08:00
parent 48e6e82451 98459d6d5e
commit daaf8eb0d2
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit 1fe20ba15a7ca3fe9f77ddf866021e7c7dfe5969 Subproject commit 61397c16728a63493507679f7e0940d9099f337f

11
frontend/src/business/components/common/head/SearchList.vue
View File

@ -98,13 +98,10 @@ export default {
} }
this.$post("/user/update/current", {id: this.userId, lastProjectId: projectId}, () => { this.$post("/user/update/current", {id: this.userId, lastProjectId: projectId}, () => {
localStorage.setItem(PROJECT_ID, projectId); localStorage.setItem(PROJECT_ID, projectId);
if (this.$route.path.indexOf('/track/review/view/') >= 0) { let path = this.$route.matched[0].path ? this.$route.matched[0].path : '/';
this.$router.replace('/track/review/all'); this.$router.push(path).then(() => {
} else if (this.$route.path.indexOf('/track/plan/view/') >= 0) { window.location.reload()
this.$router.replace('/track/plan/all'); }).catch(err => err);
} else {
window.location.reload();
}
this.changeProjectName(projectId); this.changeProjectName(projectId);
}); });
}, },

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 29a8fc09602fde5708af06582ac972d98eb69836 Subproject commit e1e8b4dffb4f71f1402ddae6bb149dd0be195342