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

Merge branch 'main' into module/journal

Browse Source
This commit is contained in:
Stephan Richter
2026-01-10 21:22:40 +01:00
parent 10ea200a2e 43ebb241e8
commit c3b49cf032
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/de/srsoftware/umbrella/core/model/WikiPage.java
View File

@@ -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;
}
}

10
frontend/src/routes/wiki/View.svelte
View File

@@ -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>

6
wiki/src/main/java/de/srsoftware/umbrella/wiki/SqliteDb.java
View File

@@ -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);