merged with trunk

This commit is contained in:
Francesco Mangiacrapa 2020-11-09 11:12:54 +01:00
parent ba9a0e92f0
commit 406bb94f8a
5 changed files with 5 additions and 10 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/geoportal-data-entry-app-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java"> <classpathentry kind="src" output="target/geoportal-data-entry-app-1.0.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>

View File

@ -1,5 +1,5 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
jarsExcludedFromWebInfLib= jarsExcludedFromWebInfLib=
lastWarOutDir=/home/francesco/git/geoportal-data-entry-app/target/geoportal-data-entry-app-1.0.0-SNAPSHOT lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-1.0.1-SNAPSHOT
warSrcDir=src/main/webapp warSrcDir=src/main/webapp
warSrcDirIsOutput=false warSrcDirIsOutput=false

View File

@ -77,9 +77,6 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="metadata-profile-form-builder-widget-1.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/metadata-profile-form-builder-widget/metadata-profile-form-builder-widget">
<dependency-type>uses</dependency-type>
</dependent-module>

View File

@ -234,10 +234,8 @@ public class GeoPortalDataEntryApp implements EntryPoint {
@Override @Override
public void onSuccess(CommitReport result) { public void onSuccess(CommitReport result) {
try { modalContainerPanel.clear();
modal.remove(loader); modal.setCloseVisible(true);
}catch (Exception e) {
}
Alert alert = new Alert(result.getMsg()); Alert alert = new Alert(result.getMsg());
switch (result.getState()) { switch (result.getState()) {
case OK: case OK:

View File

@ -133,7 +133,7 @@ public class GeonaDataEntryMainForm extends Composite {
} }
private void showAlertOnSaveAction(String text, AlertType type, boolean hideAfterAWhile){ public void showAlertOnSaveAction(String text, AlertType type, boolean hideAfterAWhile){
//Window.alert("Called alertOnCreate"); //Window.alert("Called alertOnCreate");
alertFormAction.setText(text); alertFormAction.setText(text);