Skip to content

[stable31] fix: template field title #50790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 2 commits into from
Feb 13, 2025
Merged

[stable31] fix: template field title #50790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc416f6
fix(template-filler): Hide template fields with unknown labels
elzody Jan 31, 2025
07d7c93
chore: rebuild assets
elzody Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions apps/files/src/components/TemplateFiller.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@
-->

<template>
<NcModal>
<NcModal label-id="template-field-modal__label">
<div class="template-field-modal__content">
<form>
<h3>{{ t('files', 'Fill template fields') }}</h3>
<h3 id="template-field-modal__label">
{{ t('files', 'Fill template fields') }}
</h3>

<div v-for="field in fields" :key="field.index">
<component :is="getFieldComponent(field.type)" :field="field" @input="trackInput" />
<component :is="getFieldComponent(field.type)"
v-if="fieldHasLabel(field)"
:field="field"
@input="trackInput" />
</div>
</form>
</div>
Expand Down Expand Up @@ -80,6 +85,9 @@ export default defineComponent({

return `Template${fieldComponentType}Field`
},
fieldHasLabel(field) {
return field.name || field.alias
},
async submit() {
this.loading = true

Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/components/TemplateFiller/TemplateCheckboxField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default defineComponent({

computed: {
fieldLabel() {
const label = this.field.name ?? this.field.alias ?? 'Unknown field'
const label = this.field.name || this.field.alias

return label.charAt(0).toUpperCase() + label.slice(1)
},
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/components/TemplateFiller/TemplateRichTextField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default defineComponent({

computed: {
fieldLabel() {
const label = this.field.name ?? this.field.alias ?? 'Unknown field'
const label = this.field.name || this.field.alias

return (label.charAt(0).toUpperCase() + label.slice(1))
},
Expand Down
2 changes: 2 additions & 0 deletions dist/4341-4341.js
View file
Open in desktop

Large diffs are not rendered by default.

0 dist/465-465.js.license → dist/4341-4341.js.license
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions dist/4341-4341.js.map
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/4341-4341.js.map.license
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4341-4341.js.license
2 changes: 0 additions & 2 deletions dist/465-465.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dist/465-465.js.map
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dist/465-465.js.map.license
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions dist/files-init.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-init.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading