Compare commits
7 Commits
bugfix/tim
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 43ebb241e8 | |||
| 1187956625 | |||
| fe0068f5ed | |||
| e92a4bedb9 | |||
| 11d14afb00 | |||
| 77e546bd4b | |||
| beb58bbc36 |
@@ -41,6 +41,11 @@ jobs:
|
||||
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
|
||||
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
|
||||
|
||||
- name: Restart vj.srsoftware.de
|
||||
if: github.ref == 'refs/heads/main'
|
||||
run: |
|
||||
curl -X POST -H "Authorization: Bearer ${{ secrets.MAKE_BEARER }}" -d vj_start https://make.srsoftware.de/launch
|
||||
|
||||
Clean-Registry:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user