Compare commits

..

2 Commits

Author SHA1 Message Date
Michael Hoennig
9d3c73c4ea Merge remote-tracking branch 'origin/master' into introduce-hosting-module
# Conflicts:
#	src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacView.java
2024-04-23 10:43:37 +02:00
9806bcd78f conditional insert permission grant (so far just exactly 1 unique for each table) (#48)
Co-authored-by: Michael Hoennig <michael@hoennig.de>
Reviewed-on: #48
Reviewed-by: Timotheus Pokorra <timotheus.pokorra@hostsharing.net>
2024-04-23 10:42:24 +02:00

View File

@ -365,7 +365,7 @@ public class RbacView {
}); });
try { try {
// TODO.impl: this only works for directly recursive RBAC definitions, not for indirect recursion // TODO.rbac: this only works for directly recursive RBAC definitions, not for indirect recursion
final var rbacDef = entityClass == rootEntityAlias.entityClass final var rbacDef = entityClass == rootEntityAlias.entityClass
? this ? this
: rbacDefinition(entityClass); : rbacDefinition(entityClass);
@ -898,7 +898,7 @@ public class RbacView {
return entityClass == null; return entityClass == null;
} }
@Override @NotNull
public SQL fetchSql() { public SQL fetchSql() {
if (fetchSql == null) { if (fetchSql == null) {
return SQL.noop(); return SQL.noop();