Skip to content

Commit

Permalink
Merge pull request #6382 from IQSS/6380-metadata-input-validation-fix
Browse files Browse the repository at this point in the history 
Reverted required attribute on metadata input fields to fix validation ref #6380
  • Loading branch information
@kcondon
kcondon authored Nov 20, 2019
2 parents bf68f12 + a3997a4 commit 2976f2a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/main/webapp/datasetFieldForEditFragment.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- input text start UPDATE: UI:REMOVE applied due to duplicate ID errors, left code as reference incase test scripts complain -->
<span id="pre-input-#{dsf.datasetFieldType.name}" class="pre-input-tag"/></ui:remove>

<p:inputText value="#{dsfv.valueForEdit}" id="inputText" required="#{required}"
<p:inputText value="#{dsfv.valueForEdit}" id="inputText" pt:aria-required="#{dsf.required}"
styleClass="form-control #{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE' ? 'datasetfield-title' : ''}"
rendered="#{!dsfv.datasetField.datasetFieldType.controlledVocabulary
and (dsfv.datasetField.datasetFieldType.fieldType == 'TEXT'
Expand All @@ -22,7 +22,7 @@
or dsfv.datasetField.datasetFieldType.fieldType == 'EMAIL')}"/>
<p:watermark for="inputText" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>

<p:inputTextarea value="#{dsfv.valueForEdit}" id="description" required="#{required}"
<p:inputTextarea value="#{dsfv.valueForEdit}" id="description" pt:aria-required="#{dsf.required}"
rows="5" cols="60" styleClass="form-control"
rendered="#{dsfv.datasetField.datasetFieldType.fieldType == 'TEXTBOX'}"/>
<p:watermark for="description" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>
Expand Down
18 changes: 8 additions & 10 deletions src/main/webapp/metadataFragment.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@
<ui:include src="datasetFieldForEditFragment.xhtml">
<ui:param name="dsfv" value="#{dsfv}"/>
<ui:param name="dsfvIndex" value="#{valCount.index}"/>
<ui:param name="required" value="#{dsf.required}"/>
</ui:include>
</div>
<!-- Add / Remove buttons -->
Expand All @@ -153,19 +152,19 @@
</ui:repeat>
<ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
<p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
id="unique1" required="#{dsf.required}" rendered="#{!dsf.datasetFieldType.allowMultiples}">
id="unique1" rendered="#{!dsf.datasetFieldType.allowMultiples}">
<f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
<f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
</p:selectOneMenu>
<div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{dsf.datasetFieldType.allowMultiples}">
<p:selectManyCheckbox value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" layout="pageDirection"
id="unique2" required="#{dsf.required}">
id="unique2">
<f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
<f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
</p:selectManyCheckbox>
</div>
<div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
<strong>#{dsf.validationMessage}</strong>
<div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty dsf.validationMessage}">
<span class="ui-message-error-detail">#{dsf.validationMessage}</span>
</div>
</ui:fragment>
</div>
Expand Down Expand Up @@ -204,24 +203,23 @@
<ui:include src="datasetFieldForEditFragment.xhtml">
<ui:param name="dsfv" value="#{subdsf.singleValue}"/>
<ui:param name="dsfvIndex" value="0"/>
<ui:param name="required" value="#{subdsf.required}"/>
</ui:include>
</ui:fragment>
<!-- MOVED SELECT ONE TO dataFieldForEdit -->
<div jsf:rendered="#{subdsf.datasetFieldType.controlledVocabulary}">
<p:selectOneMenu value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;"
required="#{subdsf.required}" rendered="#{!subdsf.datasetFieldType.allowMultiples}">
rendered="#{!subdsf.datasetFieldType.allowMultiples}">
<f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
<f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
</p:selectOneMenu>
<div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{subdsf.datasetFieldType.allowMultiples}">
<p:selectManyCheckbox value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
required="#{subdsf.required}" layout="pageDirection">
layout="pageDirection">
<f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
</p:selectManyCheckbox>
</div>
<div class="alert-danger" jsf:rendered="#{!empty subdsf.validationMessage}">
<strong>#{subdsf.validationMessage}</strong>
<div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty subdsf.validationMessage}">
<span class="ui-message-error-detail">#{subdsf.validationMessage}</span>
</div>
</div>
</div>
Expand Down

0 comments on commit 2976f2a

Please sign in to comment.