From b5c7332f5976cc19ab681ed4b82501a62c6a2f61 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gmail.com>
Date: Tue, 30 Jun 2015 08:48:35 -0400
Subject: [PATCH] Merge pull request #277 from mrjoel/mrjoel-serverNPEfix
---
src/main/java/com/gitblit/wicket/panels/ChoiceOption.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/ChoiceOption.java b/src/main/java/com/gitblit/wicket/panels/ChoiceOption.java
index cc084a7..9c25b70 100644
--- a/src/main/java/com/gitblit/wicket/panels/ChoiceOption.java
+++ b/src/main/java/com/gitblit/wicket/panels/ChoiceOption.java
@@ -20,6 +20,7 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.model.IModel;
+import org.parboiled.common.StringUtils;
/**
* A re-usable choice option panel.
@@ -38,14 +39,14 @@
public ChoiceOption(String wicketId, String title, String description, IModel<T> model, List<T> choices) {
super(wicketId);
add(new Label("name", title));
- add(new Label("description", description));
+ add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
add(new DropDownChoice<>("choice", model, choices).setEnabled(choices.size() > 0));
}
public ChoiceOption(String wicketId, String title, String description, DropDownChoice<?> choice) {
super(wicketId);
add(new Label("name", title));
- add(new Label("description", description));
+ add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
add(choice.setMarkupId("choice").setEnabled(choice.getChoices().size() > 0));
}
}
--
Gitblit v1.9.1