Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-04-06 12:06:55 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8760 from jwangyangls/revert-8494-fix-global-search

Browse Source 
Revert "Fix redirect login page when enter harbor through global search"
This commit is contained in:
jwangyangls 2019-08-23 10:33:03 +08:00 committed by GitHub
commit 503f5352f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/portal/src/app/shared/route/member-guard-activate.service.ts
View File

@ -41,19 +41,8 @@ export class MemberGuard implements CanActivate, CanActivateChild {
this.checkMemberStatus(state.url, projectId).subscribe((res) => observer.next(res)); this.checkMemberStatus(state.url, projectId).subscribe((res) => observer.next(res));
} }
, error => { , error => {
// if it is public project return true; this.router.navigate([CommonRoutes.HARBOR_DEFAULT]);
this.projectService.getProject(projectId).subscribe(project => { observer.next(false);
if (project.metadata.public) {
observer.next(true);
} else {
this.router.navigate([CommonRoutes.HARBOR_DEFAULT]);
observer.next(false);
}
}, err => {
this.router.navigate([CommonRoutes.HARBOR_DEFAULT]);
observer.next(false);
});
}); });
} else { } else {
this.checkMemberStatus(state.url, projectId).subscribe((res) => observer.next(res)); this.checkMemberStatus(state.url, projectId).subscribe((res) => observer.next(res));