From 8a3b95e34875336b295651f6aa4b5bfa25716d67 Mon Sep 17 00:00:00 2001 From: Ivo Valchev Date: Mon, 11 May 2020 13:46:34 +0200 Subject: [PATCH 1/2] Refactor required attribute to be bool, not int --- assets/js/app/editor/Components/Date.vue | 4 ++-- assets/js/app/editor/Components/Email.vue | 4 ++-- assets/js/app/editor/Components/Embed.vue | 4 ++-- assets/js/app/editor/Components/File.vue | 7 ++++--- assets/js/app/editor/Components/Image.vue | 4 ++-- assets/js/app/editor/Components/Number.vue | 4 ++-- assets/js/app/editor/Components/Slug.vue | 4 ++-- assets/js/app/editor/Components/Text.vue | 8 ++++---- assets/js/app/editor/Components/Textarea.vue | 4 ++-- templates/_partials/fields/_base.html.twig | 2 +- 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/assets/js/app/editor/Components/Date.vue b/assets/js/app/editor/Components/Date.vue index 38a525d83..80fcdbc64 100644 --- a/assets/js/app/editor/Components/Date.vue +++ b/assets/js/app/editor/Components/Date.vue @@ -9,7 +9,7 @@ :form="form" :name="name" placeholder="Select date" - :required="required == 1" + :required="required" :data-errormessage="errormessage" > @@ -86,7 +86,7 @@ export default { default: '', }, required: { - type: Number, + type: Boolean, required: true, }, errormessage: { diff --git a/assets/js/app/editor/Components/Email.vue b/assets/js/app/editor/Components/Email.vue index a43190cfd..a08ce102e 100644 --- a/assets/js/app/editor/Components/Email.vue +++ b/assets/js/app/editor/Components/Email.vue @@ -6,7 +6,7 @@ :name="name" :value="value" type="email" - :required="required == 1" + :required="required" :readonly="readonly" :data-errormessage="errormessage" :pattern="pattern" @@ -29,7 +29,7 @@ export default { type: String, }, required: { - type: Number, + type: Boolean, }, readonly: { type: Boolean, diff --git a/assets/js/app/editor/Components/Embed.vue b/assets/js/app/editor/Components/Embed.vue index ba33efaae..1f8ab6fc7 100644 --- a/assets/js/app/editor/Components/Embed.vue +++ b/assets/js/app/editor/Components/Embed.vue @@ -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" @@ -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, diff --git a/assets/js/app/editor/Components/File.vue b/assets/js/app/editor/Components/File.vue index b4b24683c..0d450d317 100644 --- a/assets/js/app/editor/Components/File.vue +++ b/assets/js/app/editor/Components/File.vue @@ -22,7 +22,7 @@ :placeholder="labels.placeholder_filename" :value="filenameData" data-readonly="readonly" - :required="required == 1" + :required="required" :data-errormessage="errormessage" /> @@ -32,7 +32,7 @@ class="form-control" :name="name + '[title]'" type="text" - :required="required == 1" + :required="required" :readonly="readonly" :pattern="pattern" :placeholder="getPlaceholder" @@ -160,13 +160,14 @@ 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, placeholder: String | Boolean, }, data() { + console.log(this.required); return { isDragging: false, dragCount: 0, diff --git a/assets/js/app/editor/Components/Image.vue b/assets/js/app/editor/Components/Image.vue index b4be44a7d..10dfd63d2 100644 --- a/assets/js/app/editor/Components/Image.vue +++ b/assets/js/app/editor/Components/Image.vue @@ -22,7 +22,7 @@ :placeholder="labels.placeholder_filename" :value="filenameData" data-readonly="readonly" - :required="required == 1" + :required="required" :data-errormessage="errormessage" /> @@ -161,7 +161,7 @@ export default { props: { filename: String, name: String, - required: Number, + required: Boolean, readonly: Boolean, thumbnail: String, alt: String, diff --git a/assets/js/app/editor/Components/Number.vue b/assets/js/app/editor/Components/Number.vue index 075a90202..748e8116f 100644 --- a/assets/js/app/editor/Components/Number.vue +++ b/assets/js/app/editor/Components/Number.vue @@ -6,7 +6,7 @@ class="form-control" type="number" :step="step" - :required="required == 1" + :required="required" :readonly="readonly" :data-errormessage="errormessage" :pattern="pattern" @@ -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, diff --git a/assets/js/app/editor/Components/Slug.vue b/assets/js/app/editor/Components/Slug.vue index f9c69db45..22024f888 100644 --- a/assets/js/app/editor/Components/Slug.vue +++ b/assets/js/app/editor/Components/Slug.vue @@ -12,7 +12,7 @@ type="text" :class="fieldClass" :readonly="readonly || !edit" - :required="required == 1" + :required="required" :data-errormessage="errormessage" :pattern="pattern" /> @@ -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, diff --git a/assets/js/app/editor/Components/Text.vue b/assets/js/app/editor/Components/Text.vue index c0037d38b..7d6ca19f3 100644 --- a/assets/js/app/editor/Components/Text.vue +++ b/assets/js/app/editor/Components/Text.vue @@ -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" @@ -30,7 +30,7 @@ export default { type: String, disabled: Boolean, id: String, - required: Number, + required: Boolean, readonly: Boolean, errormessage: String | Boolean, pattern: String | Boolean, diff --git a/assets/js/app/editor/Components/Textarea.vue b/assets/js/app/editor/Components/Textarea.vue index cd865b019..593d922d0 100644 --- a/assets/js/app/editor/Components/Textarea.vue +++ b/assets/js/app/editor/Components/Textarea.vue @@ -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" @@ -23,7 +23,7 @@ export default { props: { value: String, name: String, - required: Number, + required: Boolean, readonly: Boolean, errormessage: String | Boolean, pattern: String | Boolean, diff --git a/templates/_partials/fields/_base.html.twig b/templates/_partials/fields/_base.html.twig index 6e4067ff8..b68896fc3 100644 --- a/templates/_partials/fields/_base.html.twig +++ b/templates/_partials/fields/_base.html.twig @@ -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 #} From 20ea86a18a2a91a094fdd13ec5cd00c1450c2cb2 Mon Sep 17 00:00:00 2001 From: Ivo Valchev Date: Mon, 11 May 2020 14:46:52 +0200 Subject: [PATCH 2/2] csfix --- assets/js/app/editor/Components/File.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/js/app/editor/Components/File.vue b/assets/js/app/editor/Components/File.vue index 0d450d317..901288d75 100644 --- a/assets/js/app/editor/Components/File.vue +++ b/assets/js/app/editor/Components/File.vue @@ -167,7 +167,6 @@ export default { placeholder: String | Boolean, }, data() { - console.log(this.required); return { isDragging: false, dragCount: 0,