Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/app/shared/form/builder/parsers/field-parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@ import {
import { TranslateService } from '@ngx-translate/core';
import uniqueId from 'lodash/uniqueId';

import {
SubmissionVisibilityType,
SubmissionVisibilityValue,
} from '../../../../core/config/models/config-submission-section.model';
import { SubmissionVisibilityType } from '../../../../core/config/models/config-submission-section.model';
import { MetadataValue } from '../../../../core/shared/metadata.models';
import { Metadata } from '../../../../core/shared/metadata.utils';
import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
import { SubmissionVisibility } from '../../../../submission/utils/visibility.util';
import { isNgbDateStruct } from '../../../date.util';
import {
hasValue,
Expand Down Expand Up @@ -372,8 +370,9 @@ export abstract class FieldParser {
}

/**
* Check if a field is read-only with the given scope
* Check if a field is read-only within the given scope
* @param visibility
* @param fieldScope
* @param submissionScope
*/
private isFieldReadOnly(visibility: SubmissionVisibilityType, fieldScope: string, submissionScope: string) {
Expand All @@ -382,12 +381,12 @@ export abstract class FieldParser {
&& isNotEmpty(visibility)
&& ((
submissionScope === SubmissionScopeType.WorkspaceItem.valueOf()
&& visibility.main === SubmissionVisibilityValue.ReadOnly
&& SubmissionVisibility.isReadOnly(visibility, SubmissionScopeType.WorkspaceItem)
)
||
(visibility.other === SubmissionVisibilityValue.ReadOnly
&& submissionScope === SubmissionScopeType.WorkflowItem.valueOf()
)
(submissionScope === SubmissionScopeType.WorkflowItem.valueOf()
&& SubmissionVisibility.isReadOnly(visibility, SubmissionScopeType.WorkflowItem)
)
);
}

Expand Down