added another fix:

- public wiki pages now show login form for guests
- private wiki pages now also show when opened via url (i.e. not by link within umbrella)

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

core/src/main/java/de/srsoftware/umbrella/core/model/WikiPage.java

@@ -18,7 +18,7 @@ public class WikiPage implements Mappable {
 	private final long id;
 	private String title;
 	private int version;
-	private final List<Integer> versions = new ArrayList<>();
+	private final Set<Integer> versions = new TreeSet<>();
 	private final Map<Long,Member> members = new HashMap<>();
 	private String content;
 	private Set<String> dirtyFields = new HashSet<>();
@@ -157,7 +157,7 @@ public class WikiPage implements Mappable {
 		return version;
 	}
 
-	public List<Integer> versions(){
+	public Set<Integer> versions(){
 		return versions;
 	}
 }

frontend/src/routes/wiki/GuestView.svelte

@@ -1,4 +1,6 @@
 <script>
+	import Login       from "../../Components/Login.svelte";
+
     import { onMount }       from 'svelte';
     import { useTinyRouter } from 'svelte-tiny-router';
     import { api }           from '../../urls.svelte';
@@ -45,3 +47,4 @@
     </div>
 </div>
 {/if}
+<Login />

frontend/src/routes/wiki/View.svelte

@@ -14,7 +14,7 @@
 
     let detail = $state(false);
     let { key, version } = $props();
-    let page = $state(null);
+    let page = $state({});
     let router = useTinyRouter();
     let members = $state({});
     let editable = $derived(page.members[user.id].permission.code<4);
@@ -72,9 +72,9 @@
 
     async function loadContent(res){
         if (res.ok){
-            page  = null;
-            page  = await res.json();
-            page.versions.sort((a,b)=>b-a);
+            let json  = await res.json();
+            json.versions.sort((a,b)=>b-a);
+            page = { ...json };
             yikes();
             return true;
         } else {
@@ -131,7 +131,7 @@
 
     $effect(loadPage);
 </script>
-{#if page}
+{#if page && page.versions}
 <div class="wiki page">
     <div class="versions">
         <span class="version">{t('version')}</span>

wiki/src/main/java/de/srsoftware/umbrella/wiki/SqliteDb.java

@@ -268,8 +268,10 @@ public class SqliteDb extends BaseDb implements WikiDb {
 	@Override
 	public WikiPage save(WikiPage page) {
 		try {
-			if (page.isDirty(CONTENT) || page.isDirty(ID) || page.isDirty(TITLE)) insertInto(TABLE_PAGES,ID,VERSION,TITLE,CONTENT)
-					.values(page.id(),page.version(),page.title(),page.content()).execute(db).close();
+			if (page.isDirty(CONTENT) || page.isDirty(ID) || page.isDirty(TITLE)) {
+				insertInto(TABLE_PAGES,ID,VERSION,TITLE,CONTENT).values(page.id(),page.version(),page.title(),page.content()).execute(db).close();
+				page.versions().add(page.version());
+			}
 			if (page.isDirty(MEMBERS)){
 				Query.delete().from(TABLE_PAGES_USERS).where(PAGE_ID, equal(page.id())).where(USER_ID,Condition.notIn(page.members().keySet().toArray())).execute(db);
 				var query = replaceInto(TABLE_PAGES_USERS,PAGE_ID,USER_ID,PERMISSIONS);