Merge branch 'develop' into iss-hipcms-1048

HiP-App · Jul 15, 2018 · 4a56a01 · 4a56a01
2 parents 615e423 + dedd4f8
commit 4a56a01
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/mobile-content/achievements/achievements.component.html b/app/mobile-content/achievements/achievements.component.html
@@ -49,7 +49,7 @@ <h2 md-line>{{ achievement.title }} ({{ achievement.status | translate }}) </h2>
             <button md-icon-button color="primary" [routerLink]="['/mobile-content/achievements/edit', achievement.id]" title="{{ 'edit' | translate }}">
                 <md-icon>edit</md-icon>
             </button>
-            <button md-icon-button color="warn" (click)="deleteAchievement(achievement)" title="{{ 'delete' | translate }}">
+            <button md-icon-button click-stop-propagation color="warn" (click)="deleteAchievement(achievement)" *ngIf="achievements != undefined && !achievements.used" title="{{ 'delete' | translate }}">
                 <md-icon>delete_forever</md-icon>
             </button>