mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-15 22:13:02 +00:00
Merge tag 'dspace-7.4' into fix-ngonchanges-not-working-for-themed-components_contribute-7.4
# Conflicts: # src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts # src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts # src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts # src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts # src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html # src/app/shared/object-grid/community-grid-element/community-grid-element.component.html # src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html # src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html # src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html # src/app/shared/theme-support/themed.component.ts # src/app/thumbnail/thumbnail.component.spec.ts # src/app/thumbnail/thumbnail.component.ts # src/themes/custom/lazy-theme.module.ts
This commit is contained in:
@@ -15,6 +15,8 @@ import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.m
|
||||
import { ClaimedTaskActionsDirective } from './claimed-task-actions.directive';
|
||||
import { hasValue, isNotEmpty, hasNoValue } from '../../../empty.util';
|
||||
import { MyDSpaceActionsResult } from '../../mydspace-actions';
|
||||
import { Item } from '../../../../core/shared/item.model';
|
||||
import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
|
||||
import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
|
||||
|
||||
@Component({
|
||||
@@ -26,6 +28,11 @@ import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-ac
|
||||
* Passes on the ClaimedTask to the component and subscribes to the processCompleted output
|
||||
*/
|
||||
export class ClaimedTaskActionsLoaderComponent implements OnInit, OnChanges {
|
||||
/**
|
||||
* The item object that belonging to the ClaimedTask object
|
||||
*/
|
||||
@Input() item: Item;
|
||||
|
||||
/**
|
||||
* The ClaimedTask object
|
||||
*/
|
||||
@@ -37,6 +44,11 @@ export class ClaimedTaskActionsLoaderComponent implements OnInit, OnChanges {
|
||||
*/
|
||||
@Input() option: string;
|
||||
|
||||
/**
|
||||
* The workflowitem object that belonging to the ClaimedTask object
|
||||
*/
|
||||
@Input() workflowitem: WorkflowItem;
|
||||
|
||||
/**
|
||||
* Emits the success or failure of a processed action
|
||||
*/
|
||||
|
Reference in New Issue
Block a user