Merge branch 'main' into accounting
This commit is contained in:
@@ -241,7 +241,7 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<h2>{t('Stock')}</h2>
|
<h2>{t('Stock')}</h2>
|
||||||
<div class="grid3">
|
<div class="stock grid3">
|
||||||
<div class="locations">
|
<div class="locations">
|
||||||
{#if top_level}
|
{#if top_level}
|
||||||
{#each top_level as realm,idx}
|
{#each top_level as realm,idx}
|
||||||
@@ -278,11 +278,11 @@
|
|||||||
</div>
|
</div>
|
||||||
{#if item && data && data.users}
|
{#if item && data && data.users}
|
||||||
<div class="tags">
|
<div class="tags">
|
||||||
<span>{t('tags')}</span>
|
<h4>{t('tags')}</h4>
|
||||||
<Tags module="stock" id={item.id} user_list={data.users} />
|
<Tags module="stock" id={item.id} user_list={data.users} />
|
||||||
</div>
|
</div>
|
||||||
<div class="notes">
|
<div class="notes">
|
||||||
<span>{t('notes')}</span>
|
<h4>{t('notes')}</h4>
|
||||||
<Notes module="stock" entity_id={item.id} />
|
<Notes module="stock" entity_id={item.id} />
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -92,7 +92,7 @@
|
|||||||
async function onCommit(wrapped){
|
async function onCommit(wrapped){
|
||||||
if (!wrapped.display) {
|
if (!wrapped.display) {
|
||||||
onEmptyCommit();
|
onEmptyCommit();
|
||||||
} else addTag(wrapped.display);
|
} else addTag(wrapped.display.trim());
|
||||||
}
|
}
|
||||||
|
|
||||||
function onSelect(dummy){}
|
function onSelect(dummy){}
|
||||||
|
|||||||
@@ -198,7 +198,10 @@
|
|||||||
{/if}
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
<MarkdownEditor {editable} value={page.content} onSet={s => patch({content:s})} store_id="wiki/{page.id}/description" />
|
<MarkdownEditor {editable} value={page.content} onSet={s => patch({content:s})} store_id="wiki/{page.id}/description" />
|
||||||
<TagList module="wiki" id={page.id} user_list={Object.keys(page.members).map(id => +id)} />
|
<div class="tags">
|
||||||
|
<h3>{t('tags')}</h3>
|
||||||
|
<TagList module="wiki" id={page.id} user_list={Object.keys(page.members).map(id => +id)} />
|
||||||
|
</div>
|
||||||
<div class="notes">
|
<div class="notes">
|
||||||
<h3>{t('notes')}</h3>
|
<h3>{t('notes')}</h3>
|
||||||
<Notes module="wiki" entity_id={page.id} />
|
<Notes module="wiki" entity_id={page.id} />
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ public class TagModule extends BaseHandler implements TagService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void save(String module, long entityId, Collection<Long> userIds, Collection<String> tags) {
|
public void save(String module, long entityId, Collection<Long> userIds, Collection<String> tags) {
|
||||||
tagDb.save(userIds,module,entityId,tags);
|
tagDb.save(userIds,module,entityId,tags.stream().map(String::trim).toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -539,6 +539,10 @@ a.wikilink{
|
|||||||
grid-template-columns: [left] 1fr [first] 1fr [second] 1fr [right]
|
grid-template-columns: [left] 1fr [first] 1fr [second] 1fr [right]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.stock.grid3{
|
||||||
|
grid-template-columns: [left] 1fr [first] 1fr [second] 2fr [right]
|
||||||
|
}
|
||||||
|
|
||||||
.grid3 .locations {
|
.grid3 .locations {
|
||||||
grid-row-end: span 3;
|
grid-row-end: span 3;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user