NIHVIVO-646 Continued work on custom form for adding authors to publications
This commit is contained in:
parent
7568169fdd
commit
ba418660e3
2 changed files with 20 additions and 6 deletions
|
@ -1,4 +1,3 @@
|
|||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
|
||||
<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
|
@ -147,7 +146,12 @@
|
|||
<name>label</name>
|
||||
<required>false</required>
|
||||
<rtexprvalue>true</rtexprvalue>
|
||||
</attribute>
|
||||
</attribute>
|
||||
<attribute>
|
||||
<name>cancelLabel</name>
|
||||
<required>false</required>
|
||||
<rtexprvalue>true</rtexprvalue>
|
||||
</attribute>
|
||||
<attribute>
|
||||
<name>cssClass</name>
|
||||
<required>false</required>
|
||||
|
|
|
@ -55,6 +55,7 @@ public class InputElementFormattingTag extends TagSupport {
|
|||
private String id;
|
||||
private String type;
|
||||
private String label;
|
||||
private String cancelLabel;
|
||||
private String cssClass;
|
||||
private String labelClass;
|
||||
private String value;
|
||||
|
@ -89,6 +90,12 @@ public class InputElementFormattingTag extends TagSupport {
|
|||
this.label = labelStr;
|
||||
}
|
||||
|
||||
public String getCancelLabel() {
|
||||
return cancelLabel;
|
||||
}
|
||||
public void setCancelLabel(String cancelLabel) {
|
||||
this.cancelLabel = cancelLabel;
|
||||
}
|
||||
public String getCssClass() {
|
||||
return cssClass;
|
||||
}
|
||||
|
@ -273,7 +280,10 @@ public class InputElementFormattingTag extends TagSupport {
|
|||
|
||||
private String doCancel(String labelStr, EditConfiguration editConfig){
|
||||
if (labelStr==null || labelStr.equals("")) {
|
||||
labelStr="Cancel";
|
||||
labelStr = getCancelLabel();
|
||||
if (labelStr==null || labelStr.equals("")) {
|
||||
labelStr="Cancel";
|
||||
}
|
||||
}
|
||||
VitroRequest vreq = new VitroRequest((HttpServletRequest)pageContext.getRequest());
|
||||
if( "about".equals( getCancel() )){
|
||||
|
@ -1003,7 +1013,7 @@ public class InputElementFormattingTag extends TagSupport {
|
|||
log.debug("found existing literal of type Date for field " + fieldName);
|
||||
}else if( valueFromLiteral instanceof String){
|
||||
strFromLit = (String) valueFromLiteral;
|
||||
log.debug("found exisitng literal of type String for field " + fieldName);
|
||||
log.debug("found existing literal of type String for field " + fieldName);
|
||||
} else if ( valueFromLiteral instanceof XSDDateTime) {
|
||||
strFromLit = date.getLexicalForm();
|
||||
log.debug("found existing literal of type XSDDateTime for field " + fieldName);
|
||||
|
@ -1126,6 +1136,6 @@ public class InputElementFormattingTag extends TagSupport {
|
|||
|
||||
return sb;
|
||||
}
|
||||
|
||||
final String SELECTED = "selected=\"selected\"";
|
||||
|
||||
final String SELECTED = "selected=\"selected\"";
|
||||
}
|
Loading…
Add table
Reference in a new issue