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

Merge branch 'bugfix/markdown-edit' into dev
Build Docker Image / Docker-Build (push) Successful in 3m0s
Details
Build Docker Image / Clean-Registry (push) Successful in 4s
Details

Browse Source
This commit is contained in:
Stephan Richter
2026-05-05 08:27:19 +02:00
parent 80153ada13 80311c8493
commit dc1a5f4e94
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/de/srsoftware/umbrella/core/model/IdOrString.java
+2 -3
View File
@@ -1,14 +1,13 @@
/* © SRSoftware 2025 */ /* © SRSoftware 2025 */
package de.srsoftware.umbrella.core.model; package de.srsoftware.umbrella.core.model;
import static de.srsoftware.tools.Optionals.isSet;
import de.srsoftware.tools.Mappable; import de.srsoftware.tools.Mappable;
import de.srsoftware.umbrella.core.constants.Field; import de.srsoftware.umbrella.core.constants.Field;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import static de.srsoftware.tools.Optionals.isSet;
import static de.srsoftware.tools.Optionals.nullIfEmpty;
public class IdOrString implements Mappable { public class IdOrString implements Mappable {
private final Long id; private final Long id;
private final String value; private final String value;
frontend/src/Components/MarkdownEditor.svelte
+1 -1
View File
@@ -155,7 +155,7 @@
{/if} {/if}
{:else} {:else}
<Display classes={{editable}} markdown={value} {onclick} {oncontextmenu} title={t('right_click_to_edit')} wrapper={type} /> <Display classes={{editable}} markdown={value} {onclick} {oncontextmenu} title={t('right_click_to_edit')} wrapper={type} />
{#if !value.display} {#if !value.rendered}
<button onclick={oncontextmenu}>{t('add_object',{object:t('content')})}</button> <button onclick={oncontextmenu}>{t('add_object',{object:t('content')})}</button>
{/if} {/if}
{/if} {/if}