Skip to content

Commit 3ba3703

Browse files
authored
Merge pull request #3454 from ProgrammeVitam/bug_15519_wrong_popup
Bug #15519 : Wrong popup when updating rules on holding units
2 parents 7e03024 + c0b1dc6 commit 3ba3703

File tree

4 files changed

+42
-3
lines changed

4 files changed

+42
-3
lines changed

ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.html

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,39 @@ <h5>{{ 'ARCHIVE_SEARCH.TITLE_SEARCH' | translate }}</h5>
572572
</mat-dialog-actions>
573573
</ng-template>
574574

575+
<ng-template #launchSelectionContainsHoldingUnitAlertMessageDialog>
576+
<vitamui-dialog-header [subhead]="'ARCHIVE_SEARCH.RULES_ACTION.ACTION_ALERTE_TITLE' | translate"></vitamui-dialog-header>
577+
<mat-dialog-content>
578+
<div class="row red-text">
579+
<div class="col-1">
580+
<i class="material-icons icon-style">cancel</i>
581+
</div>
582+
<div class="col-11">
583+
{{ 'RULES.ALERTE_MESSAGES.ACTION_ALERTE_TITLE' | translate }}
584+
</div>
585+
</div>
586+
<br />
587+
<div class="row">
588+
<div class="col-1">
589+
<span class="vertical-line"></span>
590+
</div>
591+
<div class="col-11">
592+
<div class="text small bold">
593+
{{ 'ARCHIVE_SEARCH.RULES_ACTION.ACTION_ALERTE_FIRST_MESSAGE' | translate }}
594+
</div>
595+
<div class="text small">
596+
{{ 'RULES.ALERTE_MESSAGES.ACTION_ALERTE_FIRST_MESSAGE' | translate }}
597+
</div>
598+
</div>
599+
</div>
600+
</mat-dialog-content>
601+
<mat-dialog-actions>
602+
<button [matDialogClose]="true" class="btn primary btn-confirm-dialog">
603+
{{ 'RULES.ALERTE_MESSAGES.BACK_TO_SELECTION' | translate }}
604+
</button>
605+
</mat-dialog-actions>
606+
</ng-template>
607+
575608
<ng-template #confirmImportantAllowedBulkOperationsDialog>
576609
<mat-dialog-content>
577610
<div class="text large bold">

ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ export class ArchiveSearchComponent implements OnInit, OnChanges, OnDestroy, Aft
209209
reclassificationAlerteMessageDialog: TemplateRef<ArchiveSearchComponent>;
210210
@ViewChild('launchComputeInheritedRuleAlerteMessageDialog', { static: true })
211211
launchComputeInheritedRuleAlerteMessageDialog: TemplateRef<ArchiveSearchComponent>;
212+
@ViewChild('launchSelectionContainsHoldingUnitAlertMessageDialog', { static: true })
213+
launchSelectionContainsHoldingUnitAlertMessageDialog: TemplateRef<ArchiveSearchComponent>;
212214
archiveSearchResultFacets: ArchiveSearchResultFacets = new ArchiveSearchResultFacets();
213215
@ViewChild('confirmImportantAllowedBulkOperationsDialog', { static: true })
214216
confirmImportantAllowedBulkOperationsDialog: TemplateRef<ArchiveSearchComponent>;
@@ -1339,7 +1341,7 @@ export class ArchiveSearchComponent implements OnInit, OnChanges, OnDestroy, Aft
13391341
this.router,
13401342
this.selectedItemCount,
13411343
this.actionsWithThresholdReachedAlerteMessageDialogSubscription,
1342-
this.actionsWithThresholdReachedAlerteMessageDialog,
1344+
this.launchSelectionContainsHoldingUnitAlertMessageDialog,
13431345
this.confirmSecondActionBigNumberOfResultsActionDialog,
13441346
),
13451347
this.DEFAULT_UPDATE_MGT_RULES_THRESHOLD,

ui/ui-frontend/projects/archive-search/src/assets/i18n/en.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
}
1919
},
2020
"RULES_ACTION": {
21-
"UPDATE_RULE": "Update rules"
21+
"UPDATE_RULE": "Update rules",
22+
"ACTION_ALERTE_TITLE": "The requested action is not possible for this selection",
23+
"ACTION_ALERTE_FIRST_MESSAGE": "The requested action is not possible for this selection"
2224
},
2325
"PUA": {
2426
"UPDATE": "Update AUP"

ui/ui-frontend/projects/archive-search/src/assets/i18n/fr.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
}
1919
},
2020
"RULES_ACTION": {
21-
"UPDATE_RULE": "Mettre à jour des règles"
21+
"UPDATE_RULE": "Mettre à jour des règles",
22+
"ACTION_ALERTE_TITLE": "L'action demandée n'est pas possible pour cette sélection",
23+
"ACTION_ALERTE_FIRST_MESSAGE": "L'action demandée n'est pas possible pour cette sélection"
2224
},
2325
"PUA": {
2426
"UPDATE": "Mettre à jour les PUA"

0 commit comments

Comments
 (0)