Browse Source

adding display for wiki pages to tag/uses

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
feature/global_error_display
Stephan Richter 1 month ago
parent
commit
ae84a806d1
  1. 4
      frontend/src/routes/tags/Reference.svelte
  2. 1
      translations/src/main/resources/de.json
  3. 1
      translations/src/main/resources/en.json
  4. 9
      wiki/src/main/java/de/srsoftware/umbrella/wiki/WikiModule.java

4
frontend/src/routes/tags/Reference.svelte

@ -44,9 +44,11 @@
<hr/> <hr/>
{:else if module=='task' || module=='project'} {:else if module=='task' || module=='project'}
<span onclick={go}>{object.name}</span> <span onclick={go}>{object.name}</span>
{:else if module=='wiki'}
<span onclick={go}>{object.title}</span>
{:else if module=='document'} {:else if module=='document'}
<span onclick={go}>{t(object.type)} ${object.number} (${object.customer.name.split('\n')[0]})</span> <span onclick={go}>{t(object.type)} ${object.number} (${object.customer.name.split('\n')[0]})</span>
{:else} {:else}
No display defined in Reference.svelte for entities of type {module}. <span class="error">No display defined in Reference.svelte for entities of type {module}.</span>
{/if} {/if}
{/if} {/if}

1
translations/src/main/resources/de.json

@ -273,6 +273,7 @@
"welcome" : "Willkommen, {0}", "welcome" : "Willkommen, {0}",
"wiki": "Wiki", "wiki": "Wiki",
"wikis": "Wiki-Seiten",
"wiki_pages": "Wiki-Seiten", "wiki_pages": "Wiki-Seiten",
"version": "Version", "version": "Version",

1
translations/src/main/resources/en.json

@ -273,6 +273,7 @@
"welcome" : "Welcome, {0}", "welcome" : "Welcome, {0}",
"wiki": "Wiki", "wiki": "Wiki",
"wikis": "wiki pages",
"wiki_pages": "wiki pages", "wiki_pages": "wiki pages",
"version": "version", "version": "version",

9
wiki/src/main/java/de/srsoftware/umbrella/wiki/WikiModule.java

@ -80,7 +80,14 @@ public class WikiModule extends BaseHandler implements WikiService {
case null -> getUserPages(user.get(),ex); case null -> getUserPages(user.get(),ex);
case AVAILABLE -> getAvailability(path,ex); case AVAILABLE -> getAvailability(path,ex);
case PAGE -> getPage(path, user.get(), ex); case PAGE -> getPage(path, user.get(), ex);
default -> super.doGet(path,ex); default -> {
try {
Long.parseLong(head);
path.push(head);
yield getPage(path,user.get(),ex);
} catch (NumberFormatException ignored){}
yield super.doGet(path,ex);
}
}; };
} catch (UmbrellaException e){ } catch (UmbrellaException e){
return send(ex,e); return send(ex,e);

Loading…
Cancel
Save