branch develop updated (b81ab5b -> be369f2)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from b81ab5b fixes #6513 new f40ac25 fixes #6512: Enlever la notification de rafraichissement de données spatiales suite à un import new 4a3e6ca ajout du parametre ux11 pour genere les cartes new be369f2 fixes #6509 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit be369f29fe2ad0ae2da09703a9fb3b1d95e85bf2 Merge: f40ac25 4a3e6ca Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 18:15:35 2015 +0100 fixes #6509 commit f40ac258e4358c2673cc37cee11621123bb45a02 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 18:12:43 2015 +0100 fixes #6512: Enlever la notification de rafraichissement de données spatiales suite à un import commit 4a3e6ca9a0ae77ecd15c49c165852be0f5912b0a Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 14:23:37 2015 +0100 ajout du parametre ux11 pour genere les cartes Summary of changes: echobase-services/src/main/resources/rscript/extractMap.r | 3 ++- .../main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java | 4 ---- .../ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java | 3 --- .../main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java | 4 ---- echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties | 1 - echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties | 1 - 6 files changed, 2 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 4a3e6ca9a0ae77ecd15c49c165852be0f5912b0a Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 14:23:37 2015 +0100 ajout du parametre ux11 pour genere les cartes --- echobase-services/src/main/resources/rscript/extractMap.r | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/echobase-services/src/main/resources/rscript/extractMap.r b/echobase-services/src/main/resources/rscript/extractMap.r index 959eb8d..d5d7536 100644 --- a/echobase-services/src/main/resources/rscript/extractMap.r +++ b/echobase-services/src/main/resources/rscript/extractMap.r @@ -25,4 +25,5 @@ GridMaps4Echobase(mission=missionName, port=dbPort, dbname=dbName, user=dbUser, - password=dbPwd); \ No newline at end of file + password=dbPwd, + ux11=TRUE); \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit f40ac258e4358c2673cc37cee11621123bb45a02 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 18:12:43 2015 +0100 fixes #6512: Enlever la notification de rafraichissement de données spatiales suite à un import --- .../main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java | 4 ---- .../ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java | 3 --- .../main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java | 4 ---- echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties | 1 - echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties | 1 - 5 files changed, 13 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java index 91912f2..c088021 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java @@ -90,10 +90,6 @@ public class SaveEntity extends EchoBaseActionSupport implements ParameterAware properties, getEchoBaseSession().getUser()); - if (persistenceContext.isSpatialStructureFound()) { - addFlashMessage(t("echobase.info.reload.spatialData")); - } - return SUCCESS; } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java index f6fa2b4..6780a08 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java @@ -87,9 +87,6 @@ public class AbstractLaunchImport<M extends AbstractImportConfiguration, S exten @Override protected void closeAction(M model) throws Exception { destroyModel(model); - if (persistenceContext.isSpatialStructureFound()) { - addFlashMessage(t("echobase.info.reload.spatialData")); - } } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java index 8aa70d0..281ac68 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java @@ -87,9 +87,5 @@ public class Delete extends AbstractWaitAndExecAction<RemoveDataConfiguration, R @Override protected void closeAction(RemoveDataConfiguration model) throws Exception { destroyModel(model); - - if (persistenceContext.isSpatialStructureFound()) { - addFlashMessage(t("echobase.info.reload.spatialData")); - } } } diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties index ac10a36..b74d569 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties @@ -288,7 +288,6 @@ echobase.info.query.cloned=Query cloned echobase.info.query.created=Query created echobase.info.query.removed=Query removed echobase.info.query.saved=Query saved -echobase.info.reload.spatialData=Remember to refresh spatial data in the spatial data view page\! echobase.info.removeData.failed=Import removal failed echobase.info.removeData.succeded=Successful data import removal echobase.info.reportBug=Bug report diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties index a63dd69..a4cf8bf 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties @@ -291,7 +291,6 @@ echobase.info.query.cloned=Requête dupliquée echobase.info.query.created=Requête créée echobase.info.query.removed=Requête supprimée echobase.info.query.saved=Requête mise à jour -echobase.info.reload.spatialData=Pensez à recharger les données spatiales dans la page de visualisation des données spatiales\! echobase.info.removeData.failed=La suppresion de l'import a échoué echobase.info.removeData.succeded=La suppresion de l'import a réussi echobase.info.reportBug=Rapport de bug -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit be369f29fe2ad0ae2da09703a9fb3b1d95e85bf2 Merge: f40ac25 4a3e6ca Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 18:15:35 2015 +0100 fixes #6509 echobase-services/src/main/resources/rscript/extractMap.r | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm