Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 33017abc by tchemit at 2019-01-11T09:56:30Z Tentative d'ouverture d'une base avec des droits référentiel échoue - Closes #1196 - - - - - 2 changed files: - services-local/src/main/java/fr/ird/observe/services/local/ObserveSecurityHelper.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/NavigationServiceLocal.java Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/ObserveSecurityHelper.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.services.local; * #L% */ +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import fr.ird.observe.dto.ObserveDbRole; @@ -119,7 +120,7 @@ public class ObserveSecurityHelper { private void createSecurityScript(Set<ObserveDbUserDto> users, SqlScriptWriter sqlScriptWriter) { - Set<String> schemas = ObserveTopiaApplicationContext.newModelSupport().getMetadataModel().getSchemaNames(); + Set<String> schemas = ImmutableSet.<String>builder().add(SCHEMA_PUBLIC).addAll(ObserveTopiaApplicationContext.newModelSupport().getMetadataModel().getSchemaNames()).build(); List<Pair<String, String>> tables = jdbcHelper.getTables(schemas, EXTRA_TABLES); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/NavigationServiceLocal.java ===================================== @@ -32,6 +32,7 @@ import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.referential.common.ProgramHelper; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.entities.ObserveTopiaPersistenceContext; +import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.service.data.NavigationRequest; import fr.ird.observe.services.service.data.NavigationResult; @@ -57,9 +58,9 @@ public class NavigationServiceLocal extends ObserveServiceLocal implements Navig Set<ProgramReference> allPrograms = serviceContext.newService(ReferentialService.class).getReferenceSet(ProgramReference.class, null).toSet(); ImmutableMap<String, ProgramReference> programsById = Maps.uniqueIndex(allPrograms, ProgramReference::getId); - - boolean loadLongline = request.isLoadLongline(); - boolean loadSeine = request.isLoadSeine(); + boolean canReadData = serviceContext.getDataSourceConnection().map(ObserveDataSourceConnection::canReadData).orElse(false); + boolean loadLongline = request.isLoadLongline() && canReadData; + boolean loadSeine = request.isLoadSeine()&& canReadData; boolean loadEmptyProgram = request.isLoadEmptyProgram(); ArrayListMultimap<ProgramReference, TripSeineReference> tripsSeineByProgram = ArrayListMultimap.create(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/33017abc178fad8e2e812a76d254... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/33017abc178fad8e2e812a76d254... You're receiving this email because of your account on gitlab.com.