You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/08/03 19:48:35 UTC
svn commit: r1510045 - in
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings:
data/basic/dao/ConfigurationDao.java web/admin/configurations/ConfigForm.java
web/admin/configurations/ConfigsPanel.java
Author: solomax
Date: Sat Aug 3 17:48:35 2013
New Revision: 1510045
URL: http://svn.apache.org/r1510045
Log:
[OPENMEETINGS-730] Null config values are displayed as empty strings.
Config value is not required field;
getConfValue is fixed not to throw NPE;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java?rev=1510045&r1=1510044&r2=1510045&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java Sat Aug 3 17:48:35 2013
@@ -114,14 +114,14 @@ public class ConfigurationDao implements
if (list == null || list.isEmpty()) {
log.warn("Could not find key in configuration CONF_KEY: " + key);
- if (defaultValue == null) {
- return null;
- }
} else {
// Use the custom value as default value
defaultValue = list.get(0).getConf_value();
}
+ if (defaultValue == null) {
+ return null;
+ }
// Either this can be directly assigned or try to find a constructor
// that handles it
if (type.isAssignableFrom(defaultValue.getClass())) {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1510045&r1=1510044&r2=1510045&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java Sat Aug 3 17:48:35 2013
@@ -33,6 +33,7 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
@@ -73,7 +74,7 @@ public class ConfigForm extends AdminBas
}
}
}));
- add(new RequiredTextField<String>("conf_value").setLabel(Model.of(WebSession.getString(271))));
+ add(new TextField<String>("conf_value").setLabel(Model.of(WebSession.getString(271))));
add(forDatePattern("updatetime", WEB_DATE_PATTERN));
add(new Label("user.login"));
add(new TextArea<String>("comment"));
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1510045&r1=1510044&r2=1510045&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Sat Aug 3 17:48:35 2013
@@ -59,9 +59,9 @@ public class ConfigsPanel extends AdminP
@Override
protected void populateItem(final Item<Configuration> item) {
final Configuration configuration = item.getModelObject();
- item.add(new Label("configuration_id", "" + configuration.getConfiguration_id()));
- item.add(new Label("conf_key", "" + configuration.getConf_key()));
- item.add(new Label("conf_value", "" + configuration.getConf_value()));
+ item.add(new Label("configuration_id", configuration.getConfiguration_id()));
+ item.add(new Label("conf_key", configuration.getConf_key()));
+ item.add(new Label("conf_value", configuration.getConf_value()));
item.add(new AjaxEventBehavior("onclick") {
private static final long serialVersionUID = -8069413566800571061L;