Commit 41c53439 authored by COTONNEC's avatar COTONNEC
Browse files

[fix] Fix merge Imagine into develop

parent 6c948a94
......@@ -90,7 +90,7 @@ public class FishingAreaServiceImpl implements FishingAreaService {
public List<FishingAreaVO> saveAllByFishingTripId(int tripId, List<FishingAreaVO> fishingAreas) {
OperationGroupVO operationGroup = getMainUndefinedOperationGroup(tripId);
if (operationGroup == null) {
if (fishingAreas == null) {
if (fishingAreas == null || CollectionUtils.isEmpty(fishingAreas)) {
return null; // Nothing to delete
}
throw new SumarisTechnicalException("the main undefined operation was not found, please check the trip's metier");
......
......@@ -107,7 +107,7 @@ public class OperationServiceImpl implements OperationService {
@Override
public List<OperationVO> findAllByFilter(OperationFilterVO filter, int offset, int size, String sortAttribute, SortDirection sortDirection,
@NonNull OperationFetchOptions fetchOptions) {
return operationRepository.findAll(filter != null ? filter : OperationFilterVO.builder().build(), offset, size, sortAttribute, sortDirection, fetchOptions).getContent();
return operationRepository.findAll(filter != null ? filter : OperationFilterVO.builder().build(), offset, size, sortAttribute, sortDirection, fetchOptions);
}
@Override
......
......@@ -60,6 +60,7 @@ sumaris.error.missingConverter=Convert not found for type {%s}
sumaris.error.notFound=Remote resource not found
sumaris.error.person.notFound=User not found on server
sumaris.error.person.register.mail.disable=Email validation has been disables. Please fill property {%s} in the configuration file.
sumaris.error.starting=Pod is starting. Please wait...
sumaris.error.trash.notfound=Trash resource not found
sumaris.error.trip.notFound=Trip {%s} not found.
sumaris.error.validation.required=Missing mandatory attribute\: %s
......@@ -83,4 +84,3 @@ sumaris.server.mail.subject.prefix=[%s]
sumaris.server.person.register.confirm.success=Confirm registration of user {%s}
sumaris.server.started=Application is running on port\: {%s}
sumaris.server.subscription.getRequest=Received WS subscription request\: %s
sumaris.error.starting=Pod is starting. Please wait...
......@@ -56,6 +56,7 @@ sumaris.error.email.service=Envoi d'email impossible. Veuillez renseigner les pr
sumaris.error.missingConverter=Convertisseur non trouvé pour le type {%s}
sumaris.error.notFound=Donnée serveur inexistante
sumaris.error.person.notFound=Utilisateur inexistant sur le serveur
sumaris.error.starting=Serveur en cours de démarrage. Veuillez patienter...
sumaris.error.trash.notfound=Donnée en corbeille inexistante
sumaris.error.trip.notFound=Marée {%s} inexistante
sumaris.error.validation.required=Attribut obligatoire manquant \: %s
......@@ -78,5 +79,4 @@ sumaris.server.keypair.pubkey.random=Clé publique (aléatoire) utilisée par le
sumaris.server.mail.subject.prefix=[%s]
sumaris.server.person.register.confirm.success=Confirmation de l'utilisateur {%s}
sumaris.server.started=Application démarrée sur le port {%s}
sumaris.error.starting=Serveur en cours de démarrage. Veuillez patienter...
sumaris.server.subscription.getRequest=Requête abonnement recue \: %s
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment