Commit e8a31c2e authored by LAVENIER's avatar LAVENIER
Browse files

Merge branch 'release/1.5.4'

parents a0d18d25 c0778b01
......@@ -3,7 +3,7 @@
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.5.2</version>
<version>1.5.4</version>
<packaging>pom</packaging>
<name>SUMARiS</name>
<description>SUMARiS :: Maven parent</description>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.5.2</version>
<version>1.5.4</version>
</parent>
<artifactId>sumaris-core-extraction</artifactId>
......
......@@ -67,7 +67,6 @@ public class ExtractionSecurityServiceImpl implements ExtractionSecurityService
@Autowired
protected IAuthService<PersonVO> authService;
private String minRoleForNotSelfDataAccess;
@EventListener({ConfigurationReadyEvent.class, ConfigurationUpdatedEvent.class})
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>sumaris-pod</artifactId>
<groupId>net.sumaris</groupId>
<version>1.5.2</version>
<version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>sumaris-pod</artifactId>
<groupId>net.sumaris</groupId>
<version>1.5.2</version>
<version>1.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.5.2</version>
<version>1.5.4</version>
</parent>
<artifactId>sumaris-core-shared</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.5.2</version>
<version>1.5.4</version>
</parent>
<artifactId>sumaris-core</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.5.2</version>
<version>1.5.4</version>
</parent>
<artifactId>sumaris-server</artifactId>
......
......@@ -1269,7 +1269,7 @@ public class DataGraphQLService {
result.setRecorderPersonId(user.getId());
}
else {
result.setRecorderPersonId(-999); // Hide all. Should neveer occur
result.setRecorderPersonId(-999); // Hide all. Should never occur
}
}
return result;
......@@ -1277,7 +1277,7 @@ public class DataGraphQLService {
protected boolean canAccessNotSelfData() {
String minRole = config.getAuthRoleForNotSelfData();
return StringUtils.isNotBlank(minRole) || authService.hasAuthority(minRole);
return StringUtils.isBlank(minRole) || authService.hasAuthority(minRole);
}
/**
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.5.2</version>
<version>1.5.4</version>
</parent>
<artifactId>sumaris-test-shared</artifactId>
......
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