branch develop updated (a05255e -> 3bc9ba4)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from a05255e From scmwebeditor -- fg new 3bc9ba4 Fix issues on create embedded #8832 The 1 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 3bc9ba40004fd1f8f9a569598eb666201f9ec425 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Fri Dec 2 09:03:04 2016 +0100 Fix issues on create embedded #8832 Summary of changes: .../echobase/persistence/EchoBaseDbMeta.java | 34 ++++++++++------------ .../importdb/EchoBaseImportModelFactory.java | 3 +- .../resources/i18n/echobase-ui_fr_FR.properties | 4 +-- 3 files changed, 20 insertions(+), 21 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 https://gitlab.nuiton.org/codelutin/echobase.git commit 3bc9ba40004fd1f8f9a569598eb666201f9ec425 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Fri Dec 2 09:03:04 2016 +0100 Fix issues on create embedded #8832 --- .../echobase/persistence/EchoBaseDbMeta.java | 34 ++++++++++------------ .../importdb/EchoBaseImportModelFactory.java | 3 +- .../resources/i18n/echobase-ui_fr_FR.properties | 4 +-- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java index 0a7c479..18a5c50 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java @@ -49,7 +49,6 @@ public class EchoBaseDbMeta extends DbMeta<EchoBaseUserEntityEnum> { EchoBaseUserEntityEnum.AgeCategory, EchoBaseUserEntityEnum.SizeCategory, EchoBaseUserEntityEnum.Species, - EchoBaseUserEntityEnum.Calibration, EchoBaseUserEntityEnum.VesselType, EchoBaseUserEntityEnum.Mission, EchoBaseUserEntityEnum.DepthStratum, @@ -75,6 +74,7 @@ public class EchoBaseDbMeta extends DbMeta<EchoBaseUserEntityEnum> { // with deps EchoBaseUserEntityEnum.Strata, EchoBaseUserEntityEnum.AcousticInstrument, + EchoBaseUserEntityEnum.Calibration, EchoBaseUserEntityEnum.Vessel, EchoBaseUserEntityEnum.ReferenceDatum, EchoBaseUserEntityEnum.OperationMetadata, @@ -92,34 +92,32 @@ public class EchoBaseDbMeta extends DbMeta<EchoBaseUserEntityEnum> { EchoBaseUserEntityEnum.VocabularyCIEM)); private static final List<EchoBaseUserEntityEnum> DATA_TYPES = ImmutableList.copyOf(Arrays.asList( - EchoBaseUserEntityEnum.SampleData, - EchoBaseUserEntityEnum.Sample, - + + EchoBaseUserEntityEnum.Voyage, + EchoBaseUserEntityEnum.Mooring, + EchoBaseUserEntityEnum.Transit, + EchoBaseUserEntityEnum.Transect, + + EchoBaseUserEntityEnum.Operation, EchoBaseUserEntityEnum.OperationMetadataValue, EchoBaseUserEntityEnum.GearMetadataValue, - EchoBaseUserEntityEnum.Operation, - EchoBaseUserEntityEnum.Data, + EchoBaseUserEntityEnum.Sample, + EchoBaseUserEntityEnum.SampleData, + + EchoBaseUserEntityEnum.DataAcquisition, + EchoBaseUserEntityEnum.DataProcessing, - // Result has a link on cell, need then to import cell before result - // see http://forge.codelutin.com/issues/3776 EchoBaseUserEntityEnum.Cell, + EchoBaseUserEntityEnum.Data, EchoBaseUserEntityEnum.Echotype, EchoBaseUserEntityEnum.Category, EchoBaseUserEntityEnum.Result, -// EchoBaseEntityEnum.Cell, - EchoBaseUserEntityEnum.DataProcessing, - EchoBaseUserEntityEnum.DataAcquisition, - EchoBaseUserEntityEnum.Transect, - EchoBaseUserEntityEnum.Transit, - EchoBaseUserEntityEnum.LengthAgeKey, - EchoBaseUserEntityEnum.LengthWeightKey, - - EchoBaseUserEntityEnum.Voyage, - EchoBaseUserEntityEnum.Mooring)); + EchoBaseUserEntityEnum.LengthWeightKey + )); private final List<TableMeta<EchoBaseUserEntityEnum>> referenceTables; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java index a33d326..137e237 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java @@ -101,7 +101,8 @@ public class EchoBaseImportModelFactory implements ImportModelFactory<EchoBaseUs EchoBaseUserEntityEnum target = meta.getTarget(); boolean result = false; if (source == EchoBaseUserEntityEnum.Echotype && target == EchoBaseUserEntityEnum.Species || - source == EchoBaseUserEntityEnum.Voyage && target == EchoBaseUserEntityEnum.Strata) { + source == EchoBaseUserEntityEnum.Voyage && target == EchoBaseUserEntityEnum.Strata || + source == EchoBaseUserEntityEnum.Transect && target == EchoBaseUserEntityEnum.AncillaryInstrumentation) { result = true; } return result; 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 410c24c..d34e804 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 @@ -295,8 +295,8 @@ echobase.importDb.freeResult=L'import de type libre s'est déroulé avec succès echobase.importDb.referentialResult=L'import de type référentiel s'est déroulé avec succès en %s. echobase.info.REchoBase=Scripts pour interroger EchoBase dans R echobase.info.click.to.select=Vous pouvez sélectionner la valeur en un simple click puis la copier (Ctrl-C) -echobase.info.createEmbedded.failed=Création de l'application embarqué réussi -echobase.info.createEmbedded.succeded=Création de l'application embarqué a échoué +echobase.info.createEmbedded.failed=Création de l'application embarqué a échoué +echobase.info.createEmbedded.succeded=Création de l'application embarqué réussi echobase.info.dbeditor.propertyDiffsResult=Résultat d'import de données echobase.info.delete.entity=La donnée de type '%s' a été supprimée echobase.info.documentation=Documentation en ligne d'EchoBase -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm