Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-06-27 23:35:10 +02:00
Code Issues Projects Releases Wiki Activity

fix issue about back to public project #1918

Browse Source
This commit is contained in:
pengpengshui 2017-08-17 14:29:23 +08:00
parent 613dfc597d
commit 04929c98f7
5 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui_ng/src/app/project/project-detail/project-detail.component.css
View File

@ -16,4 +16,6 @@
font-size: 14px;
font-style: italic;
letter-spacing: 0.01em;
}
}
.cursor{
cursor: pointer;}

2
src/ui_ng/src/app/project/project-detail/project-detail.component.html
View File

@ -1,4 +1,4 @@
<a *ngIf="hasSignedIn" [routerLink]="['/harbor', 'projects']">&lt; {{'PROJECT_DETAIL.PROJECTS' | translate}}</a>
<a *ngIf="hasSignedIn" (click)="backToProject()" class="cursor">&lt; {{'PROJECT_DETAIL.PROJECTS' | translate}}</a>
<a *ngIf="!hasSignedIn" [routerLink]="['/harbor', 'sign-in']">&lt; {{'SEARCH.BACK' | translate}}</a>
<h1 class="sub-header-title">{{currentProject.name}} <span class="role-label" *ngIf="isMember">{{roleName | translate}}</span></h1>

9
src/ui_ng/src/app/project/project-detail/project-detail.component.ts
View File

@ -57,4 +57,11 @@ export class ProjectDetailComponent {
return this.sessionService.getCurrentUser() != null;
}
}
backToProject(): void {
if (window.sessionStorage) {
window.sessionStorage.setItem('fromDetails', 'true');
}
this.router.navigate(['/harbor', 'projects']);
}
}

2
src/ui_ng/src/app/project/project.component.html
View File

@ -13,7 +13,7 @@
</div>
<div class="option-right">
<div class="select" style="float: left; left:-6px; top:8px;">
<select (change)="doFilterProjects($event)">
<select (change)="doFilterProjects($event)" [(ngModel)]="selecteType">
<option value="0" [selected]="currentFilteredType === 0">{{projectTypes[0] | translate}}</option>
<option value="1">{{projectTypes[1] | translate}}</option>
<option value="2">{{projectTypes[2] | translate}}</option>

19
src/ui_ng/src/app/project/project.component.ts
View File

@ -47,6 +47,7 @@ import { StatisticHandler } from '../shared/statictics/statistic-handler.service
changeDetection: ChangeDetectionStrategy.OnPush
})
export class ProjectComponent implements OnInit, OnDestroy {
selecteType:number = 0;
changedProjects: Project[];
projectTypes = ProjectTypes;
@ -121,6 +122,16 @@ export class ProjectComponent implements OnInit, OnDestroy {
retrieve(state?: State): void {
this.projectName = "";
if (window.sessionStorage && window.sessionStorage['projectTypeValue'] && window.sessionStorage['fromDetails']) {
this.currentFilteredType = +window.sessionStorage['projectTypeValue'];
this.selecteType = this.currentFilteredType;
window.sessionStorage.removeItem('fromDetails');
}
if (this.currentFilteredType !== 0) {
this.getProjects('', this.currentFilteredType - 1);
return;
}
this.getProjects();
}
@ -175,6 +186,9 @@ export class ProjectComponent implements OnInit, OnDestroy {
} else {
this.getProjects("", this.currentFilteredType - 1);
}
if (window.sessionStorage) {
window.sessionStorage['projectTypeValue'] = this.currentFilteredType;
}
}
}
@ -192,6 +206,11 @@ export class ProjectComponent implements OnInit, OnDestroy {
} else {
this.getProjects("", this.currentFilteredType - 1);
}
this.selecteType = this.currentFilteredType;
if (window.sessionStorage) {
window.sessionStorage['projectTypeValue'] = this.currentFilteredType;
}
},
error => this.messageHandlerService.handleError(error)
);