mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-16 14:33:03 +00:00
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:
@@ -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,
|
||||
) {
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user