litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge to trunk. Adding cancel button to default object property form. NIHVIVO-951

Browse source
This commit is contained in:
bdc34 2010-07-22 20:48:12 +00:00
parent fb26b874de
commit 8413938501
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
webapp/web/edit/forms/defaultObjPropForm.jsp
View file

@ -154,7 +154,9 @@
</div> </div>
</form> </form>
</c:if> </c:if>
<c:set var="offerCancel" value="false"/>
<c:if test="${requestScope.rangeOptionsExist == false }"> <c:if test="${requestScope.rangeOptionsExist == false }">
<c:set var="offerCancel" value="true"/>
<p>There are no entries in the system to select from.</p> <p>There are no entries in the system to select from.</p>
</c:if> </c:if>
</c:if> </c:if>
@ -173,10 +175,13 @@
<input type="hidden" value="${param.objectUri}" name="objectUri"/> <input type="hidden" value="${param.objectUri}" name="objectUri"/>
<input type="hidden" value="create" name="cmd"/> <input type="hidden" value="create" name="cmd"/>
<v:input type="typesForCreateNew" id="typeOfNew" /> <v:input type="typesForCreateNew" id="typeOfNew" />
<v:input type="submit" id="submit" value="add a new item to this list"/> <v:input type="submit" id="submit" value="add a new item to this list" cancel="${offerCancel}"/>
</form> </form>
</c:if> </c:if>
<c:if test="${(requestScope.predicate.offerCreateNewOption == false) && (requestScope.predicate.selectFromExisting == false)}"> <c:if test="${(requestScope.predicate.offerCreateNewOption == false) && (requestScope.predicate.selectFromExisting == false)}">
<p>This property is currently configured to prohibit editing. </p> <p>This property is currently configured to prohibit editing. </p>
</c:if> </c:if>