Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions assets/js/app/editor/Components/Date.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
:form="form"
:name="name"
placeholder="Select date"
:required="required == 1"
:required="required"
:data-errormessage="errormessage"
>
</flat-pickr>
Expand Down Expand Up @@ -86,7 +86,7 @@ export default {
default: '',
},
required: {
type: Number,
type: Boolean,
required: true,
},
errormessage: {
Expand Down
4 changes: 2 additions & 2 deletions assets/js/app/editor/Components/Email.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:name="name"
:value="value"
type="email"
:required="required == 1"
:required="required"
:readonly="readonly"
:data-errormessage="errormessage"
:pattern="pattern"
Expand All @@ -29,7 +29,7 @@ export default {
type: String,
},
required: {
type: Number,
type: Boolean,
},
readonly: {
type: Boolean,
Expand Down
4 changes: 2 additions & 2 deletions assets/js/app/editor/Components/Embed.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
:name="name + '[url]'"
:placeholder="labels.placeholder_content_url"
type="url"
:required="required == 1"
:required="required"
:readonly="readonly"
:data-errormessage="errormessage"
:pattern="pattern"
Expand Down Expand Up @@ -133,7 +133,7 @@ export default {
url: String,
width: Number | String, //String if not set
labels: Object,
required: Number,
required: Boolean,
readonly: Boolean,
errormessage: String | Boolean, //string if errormessage is set, and false otherwise
pattern: String | Boolean,
Expand Down
6 changes: 3 additions & 3 deletions assets/js/app/editor/Components/File.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:placeholder="labels.placeholder_filename"
:value="filenameData"
data-readonly="readonly"
:required="required == 1"
:required="required"
:data-errormessage="errormessage"
/>
</div>
Expand All @@ -32,7 +32,7 @@
class="form-control"
:name="name + '[title]'"
type="text"
:required="required == 1"
:required="required"
:readonly="readonly"
:pattern="pattern"
:placeholder="getPlaceholder"
Expand Down Expand Up @@ -160,7 +160,7 @@ export default {
isFirstInFilelist: Boolean,
isLastInFilelist: Boolean,
attributesLink: String,
required: Number,
required: Boolean,
readonly: Boolean,
errormessage: String | Boolean, //string if errormessage is set, and false otherwise
pattern: String | Boolean,
Expand Down
4 changes: 2 additions & 2 deletions assets/js/app/editor/Components/Image.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:placeholder="labels.placeholder_filename"
:value="filenameData"
data-readonly="readonly"
:required="required == 1"
:required="required"
:data-errormessage="errormessage"
/>
</div>
Expand Down Expand Up @@ -161,7 +161,7 @@ export default {
props: {
filename: String,
name: String,
required: Number,
required: Boolean,
readonly: Boolean,
thumbnail: String,
alt: String,
Expand Down
4 changes: 2 additions & 2 deletions assets/js/app/editor/Components/Number.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class="form-control"
type="number"
:step="step"
:required="required == 1"
:required="required"
:readonly="readonly"
:data-errormessage="errormessage"
:pattern="pattern"
Expand All @@ -27,7 +27,7 @@ export default {
step: Number,
type: String,
disabled: Boolean,
required: Number,
required: Boolean,
readonly: Boolean,
errormessage: String | Boolean, //string if errormessage is set, and false otherwise
pattern: String | Boolean,
Expand Down
4 changes: 2 additions & 2 deletions assets/js/app/editor/Components/Slug.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
type="text"
:class="fieldClass"
:readonly="readonly || !edit"
:required="required == 1"
:required="required"
:data-errormessage="errormessage"
:pattern="pattern"
/>
Expand Down Expand Up @@ -62,7 +62,7 @@ export default {
fieldClass: String,
generate: String,
labels: Object,
required: Number,
required: Boolean,
readonly: Boolean,
errormessage: String | Boolean, //string if errormessage is set, and false otherwise
pattern: String | Boolean,
Expand Down
8 changes: 4 additions & 4 deletions assets/js/app/editor/Components/Text.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
:class="getType"
:name="name"
type="text"
:disabled="disabled == 1"
:required="required == 1"
:readonly="readonly == true"
:disabled="disabled"
:required="required"
:readonly="readonly"
:data-errormessage="errormessage"
:pattern="pattern"
:placeholder="placeholder"
Expand All @@ -30,7 +30,7 @@ export default {
type: String,
disabled: Boolean,
id: String,
required: Number,
required: Boolean,
readonly: Boolean,
errormessage: String | Boolean,
pattern: String | Boolean,
Expand Down
4 changes: 2 additions & 2 deletions assets/js/app/editor/Components/Textarea.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class="form-control field--textarea"
:name="name"
rows="10"
:required="required == 1"
:required="required"
:readonly="readonly"
:data-errormessage="errormessage"
:pattern="pattern"
Expand All @@ -23,7 +23,7 @@ export default {
props: {
value: String,
name: String,
required: Number,
required: Boolean,
readonly: Boolean,
errormessage: String | Boolean,
pattern: String | Boolean,
Expand Down
2 changes: 1 addition & 1 deletion templates/_partials/fields/_base.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

{# Set required #}
{% if not required|default %}
{% set required = (field.definition.required|default) ? 1 : 0 %}
{% set required = (field.definition.required|default) ? true : false %}
{% endif %}

{# Set readonly #}
Expand Down