mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-10 03:23:07 +00:00
Merge remote-tracking branch 'upstream/main' into retrieve-name-with-dsonameservice-7.4
# Conflicts: # src/app/access-control/epeople-registry/epeople-registry.component.html # src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts # src/app/access-control/group-registry/group-form/group-form.component.spec.ts # src/app/access-control/group-registry/group-form/group-form.component.ts # src/app/access-control/group-registry/group-form/members-list/members-list.component.html # src/app/access-control/group-registry/group-form/members-list/members-list.component.ts # src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html # src/app/item-page/full/field-components/file-section/full-file-section.component.ts # src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts # src/app/item-page/simple/field-components/file-section/file-section.component.html # src/app/item-page/simple/field-components/file-section/file-section.component.ts # src/app/item-page/versions/item-versions.component.ts # src/app/shared/auth-nav-menu/user-menu/user-menu.component.html # src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts # src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
This commit is contained in:
@@ -26,7 +26,7 @@ import {
|
||||
import { FormGroup } from '@angular/forms';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
|
||||
import { cloneDeep } from 'lodash';
|
||||
import cloneDeep from 'lodash/cloneDeep';
|
||||
import { BitstreamDataService } from '../../core/data/bitstream-data.service';
|
||||
import {
|
||||
getAllSucceededRemoteDataPayload,
|
||||
|
Reference in New Issue
Block a user