Skip to content

OCE-547 Some Housekeeping updates #1032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpostelnicu merged 1 commit into from
Oct 30, 2025
Merged

OCE-547 Some Housekeeping updates #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ COMMON_JAVA_ARGS="$(tr '\n' ' ' <<-EOF
-Dspring.datasource.password=$POSTGRES_PASSWORD
-DJava.awt.headless=true
-XX:+UseG1GC
-XX:-UseContainerSupport
-Dspring.data.mongodb.uri=mongodb://$MONGO_INITDB_ROOT_USERNAME:$MONGO_INITDB_ROOT_PASSWORD@mongo:27017/ocportal?authSource=admin
-Dspring.datasource.url=jdbc:postgresql://db/ocportal
-Dgoogle.recaptcha.secret=$RECAPTCHA_SECRET
Expand Down
31 changes: 4 additions & 27 deletions forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/DecimalTextField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,19 @@
/* (c) 2014 - 2016 Open Source Geospatial Foundation - all rights reserved
* (c) 2001 - 2013 OpenPlans
* This code is licensed under the GPL 2.0 license, available at the root
* application directory.
*/
package org.devgateway.toolkit.forms.wicket.components;

import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.NumberTextField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.convert.IConverter;
import org.devgateway.toolkit.forms.wicket.converters.DecimalConverter;

/**
* A TextField for {@code java.lang.Double} representations that allows for arbitrary number of
* decimal places, since the default TextField rounds up doubles to three decimals.
* A TextField for decimal numbers extending Wicket's NumberTextField<Double>
*
* @author groldan
* @author mpostelnicu
*/
public class DecimalTextField extends TextField<Double> {
public class DecimalTextField extends NumberTextField<Double> {

private static final long serialVersionUID = 1L;

private DecimalConverter decimalConverter;

public DecimalTextField(String id, IModel<Double> model) {
super(id, model, Double.class);
decimalConverter = new DecimalConverter();
}

public void setMaximumFractionDigits(int maximumFractionDigits) {
decimalConverter.setMaximumFractionDigits(maximumFractionDigits);
}

@SuppressWarnings("unchecked")
@Override
public <C> IConverter<C> getConverter(Class<C> type) {
if (Double.class.isAssignableFrom(type)) {
return (IConverter<C>) decimalConverter;
}
return super.getConverter(type);
}
}
2 changes: 1 addition & 1 deletion ...vgateway/toolkit/forms/wicket/components/form/DecimalTextFieldBootstrapFormComponent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
<input wicket:id="field" type="text"></input>
<input wicket:id="field" type="number"></input>
</wicket:extend>
</html>
60 changes: 0 additions & 60 deletions forms/src/main/java/org/devgateway/toolkit/forms/wicket/converters/DecimalConverter.java
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</repository>
<repository>
<id>clojars</id>
<name>Clojure Libraries</name>
<url>https://repo.clojars.org/</url>
</repository>
<repository>
<id>devgateway-open-source</id>
<name>devgateway-open-source</name>
Expand Down