Skip to content
Snippets Groups Projects
Commit e6acc6bc authored by Hamza HRAMCHI's avatar Hamza HRAMCHI
Browse files

FEAT #15056 TIME 0:17 make some updates to display highlight

parent c687ff6b
No related branches found
No related tags found
No related merge requests found
...@@ -27,12 +27,12 @@ ...@@ -27,12 +27,12 @@
<span>{{ 'lang.freezeRetentionRule' | translate }}</span> <span>{{ 'lang.freezeRetentionRule' | translate }}</span>
</button> </button>
<mat-menu #freezeRentalRule = "matMenu"> <mat-menu #freezeRentalRule = "matMenu">
<button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === this.currentResource.resId ? 'isSelectedMenu' : 'notSelectedMenu'}}" <button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === true? 'isSelectedMenu' : 'notSelectedMenu'}}"
[title]="this.translate.instant('lang.freezeTheCurrentUsefulLife')" > [title]="this.translate.instant('lang.freezeTheCurrentUsefulLife')" >
{{ 'lang.freezeTheCurrentUsefulLife' | translate }} {{ 'lang.freezeTheCurrentUsefulLife' | translate }}
</button> </button>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze !== this.currentResource.resId ? 'isSelectedMenu' : 'notSelectedMenu'}}" <button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze === false ? 'isSelectedMenu' : 'notSelectedMenu'}}"
[title]="this.translate.instant('lang.thawTheCurrentUsefulLife')" > [title]="this.translate.instant('lang.thawTheCurrentUsefulLife')" >
{{ 'lang.thawTheCurrentUsefulLife' | translate }} {{ 'lang.thawTheCurrentUsefulLife' | translate }}
</button> </button>
......
...@@ -195,10 +195,8 @@ export class ActionsListComponent implements OnInit { ...@@ -195,10 +195,8 @@ export class ActionsListComponent implements OnInit {
getFreezeBindingValue(id) { getFreezeBindingValue(id) {
this.http.get(`../rest/resources/${id}?light=true`).pipe( this.http.get(`../rest/resources/${id}?light=true`).pipe(
tap((infos: any) => { tap((infos: any) => {
if (infos.retentionFrozen) { this.isSelectedFreeze = infos.retentionFrozen;
this.isSelectedFreeze = id; this.isSelectedBinding = infos.binding;
}
this.isSelectedBinding = infos.binding;
}), }),
catchError((err: any) => { catchError((err: any) => {
this.notify.handleErrors(err); this.notify.handleErrors(err);
......
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
<span>{{ 'lang.freezeRetentionRule' | translate }}</span> <span>{{ 'lang.freezeRetentionRule' | translate }}</span>
</button> </button>
<mat-menu #freezeRentalRule = "matMenu" ng-switch="getValue(var)"> <mat-menu #freezeRentalRule = "matMenu" ng-switch="getValue(var)">
<button mat-menu-item (click)="toggleFreezing(true)" <button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === true ? 'isSelectedMenu' : 'notSelectedMenu'}}"
[title]="this.translate.instant('lang.freezeTheCurrentUsefulLife')" > [title]="this.translate.instant('lang.freezeTheCurrentUsefulLife')" >
{{ 'lang.freezeTheCurrentUsefulLife' | translate }} {{ 'lang.freezeTheCurrentUsefulLife' | translate }}
</button> </button>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<button mat-menu-item (click)="toggleFreezing(false)" <button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze === false ? 'isSelectedMenu' : 'notSelectedMenu'}}"
[title]="this.translate.instant('lang.thawTheCurrentUsefulLife')" > [title]="this.translate.instant('lang.thawTheCurrentUsefulLife')" >
{{ 'lang.thawTheCurrentUsefulLife' | translate }} {{ 'lang.thawTheCurrentUsefulLife' | translate }}
</button> </button>
......
...@@ -192,10 +192,8 @@ export class FolderActionListComponent implements OnInit { ...@@ -192,10 +192,8 @@ export class FolderActionListComponent implements OnInit {
getFreezeBindingValue(id) { getFreezeBindingValue(id) {
this.http.get(`../rest/resources/${id}?light=true`).pipe( this.http.get(`../rest/resources/${id}?light=true`).pipe(
tap((infos: any) => { tap((infos: any) => {
if (infos.retentionFrozen) { this.isSelectedFreeze = infos.retentionFrozen;
this.isSelectedFreeze = id; this.isSelectedBinding = infos.binding;
}
this.isSelectedBinding = infos.binding;
}), }),
catchError((err: any) => { catchError((err: any) => {
this.notify.handleErrors(err); this.notify.handleErrors(err);
......
...@@ -39,12 +39,12 @@ ...@@ -39,12 +39,12 @@
<span>{{ 'lang.freezeRetentionRule' | translate }}</span> <span>{{ 'lang.freezeRetentionRule' | translate }}</span>
</button> </button>
<mat-menu #freezeRentalRule = "matMenu"> <mat-menu #freezeRentalRule = "matMenu">
<button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === this.currentResource.resId ? 'isSelectedMenu' : 'notSelectedMenu'}}" <button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === true ? 'isSelectedMenu' : 'notSelectedMenu'}}"
[title]="this.translate.instant('lang.freezeTheCurrentUsefulLife')" > [title]="this.translate.instant('lang.freezeTheCurrentUsefulLife')" >
{{ 'lang.freezeTheCurrentUsefulLife' | translate }} {{ 'lang.freezeTheCurrentUsefulLife' | translate }}
</button> </button>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze !== this.currentResource.resId ? 'isSelectedMenu' : 'notSelectedMenu'}}" <button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze === false ? 'isSelectedMenu' : 'notSelectedMenu'}}"
[title]="this.translate.instant('lang.thawTheCurrentUsefulLife')" > [title]="this.translate.instant('lang.thawTheCurrentUsefulLife')" >
{{ 'lang.thawTheCurrentUsefulLife' | translate }} {{ 'lang.thawTheCurrentUsefulLife' | translate }}
</button> </button>
......
...@@ -177,10 +177,8 @@ export class FollowedActionListComponent implements OnInit { ...@@ -177,10 +177,8 @@ export class FollowedActionListComponent implements OnInit {
getFreezeBindingValue(id) { getFreezeBindingValue(id) {
this.http.get(`../rest/resources/${id}?light=true`).pipe( this.http.get(`../rest/resources/${id}?light=true`).pipe(
tap((infos: any) => { tap((infos: any) => {
if (infos.retentionFrozen) { this.isSelectedFreeze = infos.retentionFrozen;
this.isSelectedFreeze = id; this.isSelectedBinding = infos.binding;
}
this.isSelectedBinding = infos.binding;
}), }),
catchError((err: any) => { catchError((err: any) => {
this.notify.handleErrors(err); this.notify.handleErrors(err);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment