This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit bb9d4544190854a78502bdeb89e263181c5b567a Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Jun 21 17:51:58 2016 +0200 Fix UI after modification on remove strategies for mooring --- .../echobase/ui/actions/dbeditor/GetEntities.java | 30 ++++++++++------------ .../ui/actions/removeData/ConfirmDelete.java | 5 ++-- .../echobase/ui/actions/workingDb/DashBoard.java | 2 -- .../ui/actions/workingDb/GetImportLogDetail.java | 6 ++--- echobase-ui/src/main/resources/echobase.properties | 2 ++ 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java index 35b9124..cf51d35 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java @@ -28,7 +28,6 @@ import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportLogs; import fr.ifremer.echobase.entities.ImportType; -import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.service.DbEditorService; import fr.ifremer.echobase.services.service.DecoratorService; import fr.ifremer.echobase.services.service.UserDbPersistenceService; @@ -42,10 +41,10 @@ import org.nuiton.topia.persistence.pager.FilterRuleGroupOperator; import org.nuiton.topia.persistence.pager.FilterRuleOperator; import javax.inject.Inject; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Map; +import org.nuiton.topia.persistence.TopiaEntity; /** * To obtain the data for the given request. @@ -60,10 +59,10 @@ public class GetEntities extends AbstractJSONPaginedAction { /** Logger. */ private static final Log log = LogFactory.getLog(GetEntities.class); - protected String voyageId; + protected String entityId; - public void setVoyageId(String voyageId) { - this.voyageId = voyageId; + public void setEntityId(String entityId) { + this.entityId = entityId; } /** Type of entity to load. */ @@ -113,11 +112,11 @@ public class GetEntities extends AbstractJSONPaginedAction { public String entityImportLogs() throws Exception { entityType = EchoBaseUserEntityEnum.ImportLog; - if (StringUtils.isNotBlank(voyageId)) { + if (StringUtils.isNotBlank(entityId)) { - // add a filter on voyageId + // add a filter on entityId pager.setRules(Collections.singletonList(new FilterRule( - FilterRuleOperator.eq, ImportLog.PROPERTY_VOYAGE_ID, voyageId + FilterRuleOperator.eq, ImportLog.PROPERTY_ENTITY_ID, entityId ))); pager.setGroupOp(FilterRuleGroupOperator.AND); } @@ -131,8 +130,8 @@ public class GetEntities extends AbstractJSONPaginedAction { String importTypeToString = importTypes.get(importType); row.put(ImportLog.PROPERTY_IMPORT_TYPE, importTypeToString); - Voyage voyage = userDbPersistenceService.getVoyage((String) row.get(ImportLog.PROPERTY_VOYAGE_ID)); - decoratorService.decorateForeignKey(row, ImportLog.PROPERTY_VOYAGE_ID, voyage, null); + TopiaEntity entity = userDbPersistenceService.getEntity((String) row.get(ImportLog.PROPERTY_ENTITY_ID)); + decoratorService.decorateForeignKey(row, ImportLog.PROPERTY_ENTITY_ID, entity, null); } return SUCCESS; } @@ -145,19 +144,18 @@ public class GetEntities extends AbstractJSONPaginedAction { Decorator<ImportLog> importLogDecorator = decoratorService.getDecorator( ImportLog.class, DecoratorService.DATE_ONLY); - Multimap<String, ImportLog> importLogsByVoyage = Multimaps.index( + Multimap<String, ImportLog> importLogsByEntity = Multimaps.index( userDbPersistenceService.getImportLogs(), - ImportLogs.IMPORT_LOG_VOYAGE_ID); + ImportLogs.IMPORT_LOG_ENTITY_ID); for (Map row : datas) { String id = (String) row.get("id"); - Collection<ImportLog> importLogs = importLogsByVoyage.get(id); + Collection<ImportLog> importLogs = importLogsByEntity.get(id); - Voyage voyage = userDbPersistenceService.getVoyage(id); - - decoratorService.decorateForeignKey(row, "id", voyage, null); + TopiaEntity entity = userDbPersistenceService.getEntity(id); + decoratorService.decorateForeignKey(row, "id", entity, null); // to keep importLogs decorated, indexed by their topiaId Map<String, String> imports = Maps.newHashMap(); diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java index e09add0..5cc6d86 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java @@ -35,6 +35,7 @@ import org.nuiton.decorator.Decorator; import java.io.IOException; import java.util.List; import java.util.Map; +import org.nuiton.topia.persistence.TopiaEntity; /** * Confirm to delete a import log. @@ -90,9 +91,9 @@ public class ConfirmDelete extends AbstractConfigureAction<RemoveDataConfigurati if (optionalImportLog.isPresent()) { ImportLog importLog = optionalImportLog.get(); - Voyage voyageEntity = userDbPersistenceService.getVoyage(importLog.getVoyageId()); + TopiaEntity entity = userDbPersistenceService.getEntity(importLog.getEntityId()); - String voyage = decorator.toString(voyageEntity); + String voyage = decorator.toString(entity); String importType = importTypes.get(importLog.getImportType().name()); String result = t("echobase.common.importLogToDelete", voyage, diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java index 4b53043..ad623c7 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java @@ -28,8 +28,6 @@ import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import java.io.Serializable; import java.util.List; -import static org.nuiton.i18n.I18n.t; - /** * DashBoard of existing voyages. * diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java index f8d8c11..232d79d 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java @@ -25,7 +25,6 @@ import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.ImportFile; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportType; -import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.service.DbEditorService; import fr.ifremer.echobase.services.service.DecoratorService; import fr.ifremer.echobase.services.service.UserDbPersistenceService; @@ -35,6 +34,7 @@ import org.nuiton.topia.persistence.metadata.TableMeta; import javax.inject.Inject; import java.util.Collection; import java.util.Map; +import org.nuiton.topia.persistence.TopiaEntity; /** * Obtain details of a given {@link ImportLog}. @@ -71,8 +71,8 @@ public class GetImportLogDetail extends EchoBaseActionSupport { data.put(ImportLog.PROPERTY_IMPORT_TYPE, importTypes.get(importType)); // decorate foreign keys - Voyage voyage = userDbPersistenceService.getVoyage((String) data.get(ImportLog.PROPERTY_VOYAGE_ID)); - decoratorService.decorateForeignKey(data, ImportLog.PROPERTY_VOYAGE_ID, voyage, null); + TopiaEntity entity = userDbPersistenceService.getEntity((String) data.get(ImportLog.PROPERTY_ENTITY_ID)); + decoratorService.decorateForeignKey(data, ImportLog.PROPERTY_ENTITY_ID, entity, null); // get import files Collection<ImportFile> importFiles = userDbPersistenceService.getImportFiles(importLogId); diff --git a/echobase-ui/src/main/resources/echobase.properties b/echobase-ui/src/main/resources/echobase.properties index 6ed8cc3..516880c 100644 --- a/echobase-ui/src/main/resources/echobase.properties +++ b/echobase-ui/src/main/resources/echobase.properties @@ -30,3 +30,5 @@ echobase.h2Version=${h2Version} # Lizmap version echobase.lizmap.application.version=${lizmapVersion} + +echobase.embedded=true -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.