From f026e49ce537d8fb98bcbd486e541cb6766da029 Mon Sep 17 00:00:00 2001 From: srosse <stephane.rosse@frentix.com> Date: Mon, 13 May 2019 18:52:39 +0200 Subject: [PATCH] OO-4056: NO_SEL_KEY must return null if selected --- .../propertyhandlers/GenericSelectionPropertyHandler.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/olat/user/propertyhandlers/GenericSelectionPropertyHandler.java b/src/main/java/org/olat/user/propertyhandlers/GenericSelectionPropertyHandler.java index 2133ee4798a..880d52d2f3b 100644 --- a/src/main/java/org/olat/user/propertyhandlers/GenericSelectionPropertyHandler.java +++ b/src/main/java/org/olat/user/propertyhandlers/GenericSelectionPropertyHandler.java @@ -260,10 +260,8 @@ public class GenericSelectionPropertyHandler extends AbstractUserPropertyHandler } if (formItem instanceof SingleSelection) { SingleSelection sel = (SingleSelection)formItem; - if(sel.isOneSelected()) { + if(sel.isOneSelected() && !NO_SEL_KEY.equals(sel.getSelectedKey())) { return sel.getSelectedKey(); - } else { - return null; } } return null; -- GitLab