Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-27 04:35:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6472 from pureshine/filter-tag

Browse Source 
Remove the default label when filtering images by label
This commit is contained in:
Mia ZHOU 2018-12-07 08:24:43 +08:00 committed by GitHub
commit f2a9e8ae9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/lib/src/tag/tag.component.html
View File

@ -27,7 +27,7 @@
<div class="row flex-items-xs-right rightPos"> <div class="row flex-items-xs-right rightPos">
<div id="filterArea"> <div id="filterArea">
<div class='filterLabelPiece' *ngIf="!withAdmiral" [hidden]="!openLabelFilterPiece" [style.left.px]='filterLabelPieceWidth'> <div class='filterLabelPiece' *ngIf="!withAdmiral" [hidden]="!openLabelFilterPiece" [style.left.px]='filterLabelPieceWidth'>
<hbr-label-piece [hidden]='!filterOneLabel' [label]="filterOneLabel" [labelWidth]="130"></hbr-label-piece> <hbr-label-piece *ngIf="showlabel" [hidden]='!filterOneLabel' [label]="filterOneLabel" [labelWidth]="130"></hbr-label-piece>
</div> </div>
<div class="flex-xs-middle"> <div class="flex-xs-middle">
<hbr-filter [withDivider]="true" filterPlaceholder="{{'TAG.FILTER_FOR_TAGS' | translate}}" (filterEvt)="doSearchTagNames($event)" <hbr-filter [withDivider]="true" filterPlaceholder="{{'TAG.FILTER_FOR_TAGS' | translate}}" (filterEvt)="doSearchTagNames($event)"

3
src/portal/lib/src/tag/tag.component.ts
View File

@ -103,6 +103,7 @@ export class TagComponent implements OnInit, AfterViewInit {
openLabelFilterPanel: boolean; openLabelFilterPanel: boolean;
openLabelFilterPiece: boolean; openLabelFilterPiece: boolean;
retagSrcImage: string; retagSrcImage: string;
showlabel: boolean;
createdComparator: Comparator<Tag> = new CustomComparator<Tag>("created", "date"); createdComparator: Comparator<Tag> = new CustomComparator<Tag>("created", "date");
@ -394,8 +395,10 @@ export class TagComponent implements OnInit, AfterViewInit {
if (labelInfo) { if (labelInfo) {
if (!labelInfo.iconsShow) { if (!labelInfo.iconsShow) {
this.filterLabel(labelInfo); this.filterLabel(labelInfo);
this.showlabel = true;
} else { } else {
this.unFilterLabel(labelInfo); this.unFilterLabel(labelInfo);
this.showlabel = false;
} }
} }
} }