NIHVIVO-1098 Make start year optional when adding a new position as well as when editing an existing position
This commit is contained in:
parent
1b45d59529
commit
3d612872c8
1 changed files with 2 additions and 8 deletions
|
@ -151,10 +151,6 @@
|
||||||
<c:set var="titleVerb" value="Edit" />
|
<c:set var="titleVerb" value="Edit" />
|
||||||
<c:set var="submitButtonText" value="Edit Position" />
|
<c:set var="submitButtonText" value="Edit Position" />
|
||||||
<c:set var="disabledVal" value="disabled" />
|
<c:set var="disabledVal" value="disabled" />
|
||||||
<%-- Start year is required for an add but not an edit (so editors don't have to look up the start date in order
|
|
||||||
to edit an existing entry with no start date). --%>
|
|
||||||
<c:set var="startYearRequired" value="" />
|
|
||||||
<c:set var="startYearRequiredHint" value="" />
|
|
||||||
<%
|
<%
|
||||||
} else { // adding new entry
|
} else { // adding new entry
|
||||||
%>
|
%>
|
||||||
|
@ -162,8 +158,6 @@
|
||||||
<c:set var="titleVerb" value="Create" />
|
<c:set var="titleVerb" value="Create" />
|
||||||
<c:set var="submitButtonText" value="Position" />
|
<c:set var="submitButtonText" value="Position" />
|
||||||
<c:set var="disabledVal" value="" />
|
<c:set var="disabledVal" value="" />
|
||||||
<c:set var="startYearRequired" value="\"nonempty\"," />
|
|
||||||
<c:set var="startYearRequiredHint" value="${requiredHint}" />
|
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
||||||
<c:set var="editjson" scope="request">
|
<c:set var="editjson" scope="request">
|
||||||
|
@ -260,7 +254,7 @@
|
||||||
},
|
},
|
||||||
"startYear" : {
|
"startYear" : {
|
||||||
"newResource" : "false",
|
"newResource" : "false",
|
||||||
"validators" : [ ${startYearRequired} "datatype:${gYearDatatypeUriJson}" ],
|
"validators" : [ "datatype:${gYearDatatypeUriJson}" ],
|
||||||
"optionsType" : "UNDEFINED",
|
"optionsType" : "UNDEFINED",
|
||||||
"literalOptions" : [ ],
|
"literalOptions" : [ ],
|
||||||
"predicateUri" : "",
|
"predicateUri" : "",
|
||||||
|
@ -347,7 +341,7 @@
|
||||||
<v:input type="text" label="Position Title ${requiredHint}" id="positionTitle" size="30" />
|
<v:input type="text" label="Position Title ${requiredHint}" id="positionTitle" size="30" />
|
||||||
<v:input type="select" label="Position Type ${requiredHint}" id="positionType" />
|
<v:input type="select" label="Position Type ${requiredHint}" id="positionType" />
|
||||||
|
|
||||||
<v:input type="text" label="Start Year ${startYearRequiredHint} <span class='hint'>(YYYY)</span>" id="startYear" size="4" />
|
<v:input type="text" label="Start Year <span class='hint'>(YYYY)</span>" id="startYear" size="4" />
|
||||||
<v:input type="text" label="End Year <span class='hint'>(YYYY)</span>" id="endYear" size="4" />
|
<v:input type="text" label="End Year <span class='hint'>(YYYY)</span>" id="endYear" size="4" />
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Add table
Reference in a new issue