Merge branch 'main' into DURACOM-191

# Conflicts:
#	src/app/shared/confirmation-modal/confirmation-modal.component.ts
#	src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
#	src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
This commit is contained in:
Andrea Barbasso
2024-01-24 11:45:45 +01:00
11 changed files with 122 additions and 54 deletions

View File

@@ -1,7 +1,5 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
import { DSpaceObject } from '../../core/shared/dspace-object.model';
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
import { TranslateModule } from '@ngx-translate/core';
import { NgIf } from '@angular/common';
@@ -22,7 +20,7 @@ export class ConfirmationModalComponent {
*/
@Input() brandColor = 'primary';
@Input() dso: DSpaceObject;
@Input() name: string;
/**
* An event fired when the cancel or confirm button is clicked, with respectively false or true
@@ -32,7 +30,6 @@ export class ConfirmationModalComponent {
constructor(
protected activeModal: NgbActiveModal,
public dsoNameService: DSONameService,
) {
}