smokephil/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-12-13 01:57:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dev' into feature-websockets-status

Browse source
This commit is contained in:
jonaswinkler 2020-12-06 22:53:54 +01:00
commit 522ada88ea
179 changed files with 5678 additions and 2460 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src-ui/src/app/components/common/tag/tag.component.html
View file

@ -1,2 +1,2 @@
<span *ngIf="!clickable" class="badge" [style.background]="getColour().value" [style.color]="getColour().textColor">{{tag.name}}</span>
<a [routerLink]="" *ngIf="clickable" class="badge" [style.background]="getColour().value" [style.color]="getColour().textColor">{{tag.name}}</a>
<a [routerLink]="" [title]="linkTitle" *ngIf="clickable" class="badge" [style.background]="getColour().value" [style.color]="getColour().textColor">{{tag.name}}</a>

6
src-ui/src/app/components/common/tag/tag.component.ts
View file

@ -14,10 +14,10 @@ export class TagComponent implements OnInit {
tag: PaperlessTag
@Input()
clickable: boolean = false
linkTitle: string = ""
@Output()
click = new EventEmitter()
@Input()
clickable: boolean = false
ngOnInit(): void {
}