Skip to content

Commit 7d5c456

Browse files
authored
Merge pull request DSpace#2629 from tdonohue/port_2620_to_dspace-7_x
[Port dspace-7_x] Fix for repeatable date field labels
2 parents 755e89d + 8458d58 commit 7d5c456

5 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
169169
metadataFields: [],
170170
hasSelectableMetadata: false
171171
}),
172-
new DynamicDsDatePickerModel({ id: 'datepicker' }),
172+
new DynamicDsDatePickerModel({ id: 'datepicker', repeatable: false }),
173173
new DynamicLookupModel({
174174
id: 'lookup',
175175
metadataFields: [],

src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div>
22
<fieldset class="d-flex">
3-
<legend [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
3+
<legend *ngIf="!model.repeatable" [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
44
{{model.placeholder}} <span *ngIf="model.required">*</span>
55
</legend>
66
<ds-number-picker

src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export const DATE_TEST_MODEL_CONFIG = {
2929
placeholder: 'Date',
3030
readOnly: false,
3131
required: true,
32+
repeatable: false,
3233
toggleIcon: 'fas fa-calendar'
3334
};
3435

src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export const DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER = 'DATE';
1515
export interface DynamicDsDateControlModelConfig extends DynamicDatePickerModelConfig {
1616
legend?: string;
1717
typeBindRelations?: DynamicFormControlRelation[];
18+
repeatable: boolean;
1819
}
1920

2021
/**
@@ -37,7 +38,7 @@ export class DynamicDsDatePickerModel extends DynamicDateControlModel {
3738
this.metadataValue = (config as any).metadataValue;
3839
this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
3940
this.hiddenUpdates = new BehaviorSubject<boolean>(this.hidden);
40-
41+
this.repeatable = config.repeatable;
4142
// This was a subscription, then an async setTimeout, but it seems unnecessary
4243
const parentModel = this.getRootParent(this);
4344
if (parentModel && isNotUndefined(parentModel.hidden)) {

src/app/shared/form/builder/form-builder.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ describe('FormBuilderService test suite', () => {
290290
hasSelectableMetadata: true
291291
}),
292292

293-
new DynamicDsDatePickerModel({ id: 'testDate' }),
293+
new DynamicDsDatePickerModel({ id: 'testDate', repeatable: false}),
294294

295295
new DynamicLookupModel({
296296
id: 'testLookup',

0 commit comments

Comments
 (0)