GRP-1448: (commit 2) do not allow enter key in dojo combobox

Internet2 · Dec 29, 2016 · 62e4270 · 62e4270
1 parent ebbfada
commit 62e4270
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/grouper-ui/java/src/edu/internet2/middleware/grouper/ui/tags/GrouperComboboxTag2.java b/grouper-ui/java/src/edu/internet2/middleware/grouper/ui/tags/GrouperComboboxTag2.java
@@ -11,6 +11,8 @@
 
 import org.apache.commons.lang.StringUtils;
 
+import edu.internet2.middleware.grouper.ui.util.GrouperUiConfig;
+
 
 
 /**
@@ -255,7 +257,9 @@ public void doTag() throws JspException, IOException {
     result.append("          dijit.byId('" + this.idBase + "Id').onChange = function(evt) {\n");
     result.append("            this.focusNode.setSelectionRange(0,0);\n");
     result.append("          }\n");
-    result.append("          grouperDisableEnterOnCombo('#" + this.idBase + "Id');\n");
+    if (GrouperUiConfig.retrieveConfig().propertyValueBoolean("grouperUi.disableEnterKeyOnCombobox", true)) {
+      result.append("          grouperDisableEnterOnCombo('#" + this.idBase + "Id');\n");
+    }
     result.append("        },1000);\n");
 
 //    result.append("        dijit.byId('" + this.idBase + "Id').labelFunc = function(item, store) {\n");