CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

FINERACT-1724: Improvements around maker-checker check

Browse Source
This commit is contained in:
Adam Saghy
2023-03-31 09:14:40 +02:00
committed by Arnold Gálovics
parent 883761bd80
commit c8d7f9397b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ConfigurationDomainServiceJpa.java
+8 -7
View File
@@ -60,16 +60,17 @@ public class ConfigurationDomainServiceJpa implements ConfigurationDomainService
if (StringUtils.isBlank(taskPermissionCode)) { if (StringUtils.isBlank(taskPermissionCode)) {
throw new PermissionNotFoundException(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 String makerCheckerConfigurationProperty = "maker-checker";
final GlobalConfigurationPropertyData property = getGlobalConfigurationPropertyData(makerCheckerConfigurationProperty); 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 @Override