diff --git a/dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Radio.java b/dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Radio.java index 326b9e08b6..19a31fcf89 100644 --- a/dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Radio.java +++ b/dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Radio.java @@ -133,7 +133,10 @@ public class Radio extends Field public Option addOption(boolean selected, String returnValue) throws WingException { - setOptionSelected(returnValue); + if (selected) + { + setOptionSelected(returnValue); + } return addOption(returnValue); } @@ -165,7 +168,10 @@ public class Radio extends Field */ public void addOption(boolean selected,String returnValue, String characters) throws WingException { - setOptionSelected(returnValue); + if (selected) + { + setOptionSelected(returnValue); + } addOption(returnValue,characters); } @@ -197,7 +203,10 @@ public class Radio extends Field */ public void addOption(boolean selected, int returnValue, String characters) throws WingException { - setOptionSelected(returnValue); + if (selected) + { + setOptionSelected(returnValue); + } addOption(returnValue,characters); } @@ -229,7 +238,10 @@ public class Radio extends Field */ public void addOption(boolean selected, String returnValue, Message message) throws WingException { - setOptionSelected(returnValue); + if (selected) + { + setOptionSelected(returnValue); + } addOption(returnValue,message); } @@ -261,7 +273,10 @@ public class Radio extends Field */ public void addOption(boolean selected, int returnValue, Message message) throws WingException { - setOptionSelected(returnValue); + if (selected) + { + setOptionSelected(returnValue); + } addOption(returnValue,message); } diff --git a/dspace/CHANGES b/dspace/CHANGES index b44246221f..39204639b5 100644 --- a/dspace/CHANGES +++ b/dspace/CHANGES @@ -70,6 +70,7 @@ - Fix for Jira bug [DS-86] XMLUI Feedback form does not include any protection from spamming - Fix for Jira [DS-87] XMLUI file download links break in Google search results if file 'sequence' number changes. - Fix for Jira [DS-95] XMLUI: Visiting an item page with a trailing slash returns a 404 message + - Fix for Jira [DS-96] XMLUI Wing-Framework 'Radio' class doesn't support adding radio buttons which are unselected by default. (Kim Shepherd) - [2385187] Fix for toDate method in DCDate