hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 3 Activity

Merge remote-tracking branch 'origin/master' into introduce-hosting-module

Browse Source 
# Conflicts:
#	src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacView.java
This commit is contained in:
Michael Hoennig 2024-04-23 10:43:37 +02:00
commit 9d3c73c4ea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacView.java
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();