Skip to content
Snippets Groups Projects
Commit 4e3d0df1 authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel
Browse files

Merge branch...

Merge branch '191-do-not-display-the-delete-all-tokens-button-while-there-are-no-tokens' into 'master'

Resolve "Do not display the "Delete all tokens" button while there are no tokens."

Closes #180 and #191

See merge request arsnova/frag.jetzt!177
parents f8910e6f fc3c8146
No related merge requests found
<h1>{{ 'room-page.sure' | translate }}</h1> <h2>{{ 'room-page.sure' | translate }}</h2>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<p>{{reallyDeleteText}}</p> <p>{{reallyDeleteText}}</p>
<app-dialog-action-buttons <app-dialog-action-buttons
......
<div mat-dialog-content> <div mat-dialog-content>
<h1>{{'room-page.bonus-token-header' | translate }}</h1> <h2>{{'room-page.bonus-token-header' | translate }}</h2>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<div *ngIf="bonusTokens.length >= 1"> <div *ngIf="bonusTokens.length >= 1">
<div fxLayout="row" *ngFor="let bonusToken of bonusTokens; index as i"> <div fxLayout="row" *ngFor="let bonusToken of bonusTokens; index as i">
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
</div> </div>
</div> </div>
<div *ngIf="bonusTokens.length === 0"> <div *ngIf="bonusTokens.length === 0">
<h3>{{'room-page.no-bonus' | translate }}</h3> <p>{{'room-page.no-bonus' | translate }}</p>
</div> </div>
<div fxLayoutAlign="center center"> <div fxLayoutAlign="center center" *ngIf="bonusTokens.length > 1">
<button mat-button class="delete" (click)="openDeleteAllBonusDialog()"> <button mat-button class="delete" (click)="openDeleteAllBonusDialog()">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
{{'room-page.delete-all-tokens' | translate}} {{'room-page.delete-all-tokens' | translate}}
......
h1,h2,h3 { h1,h2,h3,p {
color: var(--on-surface); color: var(--on-surface);
} }
......
...@@ -33,7 +33,6 @@ export class DeleteCommentsComponent implements OnInit { ...@@ -33,7 +33,6 @@ export class DeleteCommentsComponent implements OnInit {
}); });
this.tokenService.getTokensByRoomId(this.roomId).subscribe(tokens => { this.tokenService.getTokensByRoomId(this.roomId).subscribe(tokens => {
if (tokens.length > 0) { if (tokens.length > 0) {
console.log('LEL EHY HEREWÄ');
this.bonusQuestions = true; this.bonusQuestions = true;
} }
}); });
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment