SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

preparing to show pages to guests

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2025-09-19 09:22:44 +02:00
parent 026e098314
commit 93124a9a8c
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/de/srsoftware/umbrella/core/model/Member.java
View File

@@ -5,12 +5,17 @@ package de.srsoftware.umbrella.core.model;
import static de.srsoftware.umbrella.core.Constants.*; import static de.srsoftware.umbrella.core.Constants.*;
import de.srsoftware.tools.Mappable; import de.srsoftware.tools.Mappable;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
public record Member(UmbrellaUser user, Permission permission) implements Mappable { public record Member(UmbrellaUser user, Permission permission) implements Mappable {
@Override @Override
public Map<String, Object> toMap() { public Map<String, Object> toMap() {
return Map.of(USER,user.toMap(),PERMISSION,permission.toMap()); var map = new HashMap<String,Object>();
map.put(USER,user == null ? null : user.toMap());
map.put(PERMISSION,permission.toMap());
return map;
} }
public boolean mayWrite() { public boolean mayWrite() {

11
frontend/src/App.svelte
View File

@@ -100,11 +100,12 @@
</Router> </Router>
{:else} {:else}
<Router> <Router>
<Route path="/user/reset/pw" component={ResetPw} /> <Route path="/user/reset/pw" component={ResetPw} />
<Route path="/oidc_callback" component={Callback} /> <Route path="/oidc_callback" component={Callback} />
<Route> <Route path="/wiki/:key/view" component={WikiPage} />
<Login /> <Route>
</Route> <Login />
</Route>
</Router> </Router>
{/if} {/if}
<Footer /> <Footer />