mirror of
https://github.com/goharbor/harbor.git
synced 2024-11-25 19:56:09 +01:00
Revert changes to tags route. (#2179)
This commit is contained in:
parent
d03657e1d0
commit
62f9f842d4
@ -94,7 +94,6 @@ const harborRoutes: Routes = [
|
||||
{
|
||||
path: 'tags/:id/:repo',
|
||||
component: TagRepositoryComponent,
|
||||
canActivate: [MemberGuard],
|
||||
resolve: {
|
||||
projectResolver: ProjectRoutingResolver
|
||||
}
|
||||
|
@ -33,29 +33,24 @@ export class MemberGuard implements CanActivate, CanActivateChild {
|
||||
let projectId = route.params['id'];
|
||||
this.sessionService.setProjectMembers([]);
|
||||
return new Promise((resolve, reject) => {
|
||||
if(!this.sessionService.getCurrentUser()) {
|
||||
return resolve(true);
|
||||
}
|
||||
this.projectService.checkProjectMember(projectId)
|
||||
.subscribe(
|
||||
res=>{
|
||||
this.sessionService.setProjectMembers(res);
|
||||
return resolve(true)
|
||||
},
|
||||
error => {
|
||||
//Add exception for repository in project detail router activation.
|
||||
if(state.url.endsWith('repository')) {
|
||||
let projectId = route.params['id'];
|
||||
this.sessionService.setProjectMembers([]);
|
||||
return new Promise((resolve, reject) => {
|
||||
this.projectService.checkProjectMember(projectId)
|
||||
.subscribe(
|
||||
res=>{
|
||||
this.sessionService.setProjectMembers(res);
|
||||
return resolve(true)
|
||||
},
|
||||
error => {
|
||||
//Add exception for repository in project detail router activation.
|
||||
if(state.url.endsWith('repository')) {
|
||||
return resolve(true);
|
||||
}
|
||||
this.projectService.getProject(projectId).subscribe(project=>{
|
||||
if(project.public === 1) {
|
||||
return resolve(true);
|
||||
} else {
|
||||
this.router.navigate([CommonRoutes.HARBOR_DEFAULT]);
|
||||
return resolve(false);
|
||||
}
|
||||
this.router.navigate([CommonRoutes.HARBOR_DEFAULT]);
|
||||
return resolve(false);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user