FINERACT-1724: Improvements around maker-checker check
This commit is contained in:
committed by
Arnold Gálovics
parent
883761bd80
commit
c8d7f9397b
+8
-7
@@ -60,16 +60,17 @@ public class ConfigurationDomainServiceJpa implements ConfigurationDomainService
|
||||
if (StringUtils.isBlank(taskPermissionCode)) {
|
||||
throw new PermissionNotFoundException(taskPermissionCode);
|
||||
}
|
||||
|
||||
final Permission thisTask = this.permissionRepository.findOneByCode(taskPermissionCode);
|
||||
if (thisTask == null) {
|
||||
throw new PermissionNotFoundException(taskPermissionCode);
|
||||
}
|
||||
|
||||
final String makerCheckerConfigurationProperty = "maker-checker";
|
||||
final GlobalConfigurationPropertyData property = getGlobalConfigurationPropertyData(makerCheckerConfigurationProperty);
|
||||
if (property.isEnabled()) {
|
||||
final Permission thisTask = this.permissionRepository.findOneByCode(taskPermissionCode);
|
||||
if (thisTask == null) {
|
||||
throw new PermissionNotFoundException(taskPermissionCode);
|
||||
}
|
||||
|
||||
return thisTask.hasMakerCheckerEnabled() && property.isEnabled();
|
||||
return thisTask.hasMakerCheckerEnabled();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user