MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3101 from Budibase/fix/2955 

Fixing handlebars binding bug
This commit is contained in:
Michael Drury 2021-10-21 12:48:54 +01:00 committed by GitHub
parent 83e17da2d3 a1aaf00e41
commit c630b3ea7a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/builderStore/dataBinding.js
View File

@ -472,7 +472,7 @@ function bindingReplacement(bindableProperties, textWithBindings, convertTo) {
idx = searchString.indexOf(from) idx = searchString.indexOf(from)
if (idx !== -1) { if (idx !== -1) {
let end = idx + from.length, let end = idx + from.length,
searchReplace = Array(binding[convertTo].length).join("*") searchReplace = Array(binding[convertTo].length + 1).join("*")
// blank out parts of the search string // blank out parts of the search string
searchString = replaceBetween(searchString, idx, end, searchReplace) searchString = replaceBetween(searchString, idx, end, searchReplace)
newBoundValue = replaceBetween( newBoundValue = replaceBetween(

6
packages/builder/src/components/start/CreateAppModal.svelte
View File

@ -66,6 +66,11 @@
const checkValidity = async (values, validator) => { const checkValidity = async (values, validator) => {
const obj = object().shape(validator) const obj = object().shape(validator)
Object.keys(validator).forEach(key => ($errors[key] = null)) Object.keys(validator).forEach(key => ($errors[key] = null))
if (template?.fromFile && values.file == null) {
valid = false
return
}
try { try {
await obj.validate(values, { abortEarly: false }) await obj.validate(values, { abortEarly: false })
} catch (validationErrors) { } catch (validationErrors) {
@ -73,6 +78,7 @@
$errors[error.path] = capitalise(error.message) $errors[error.path] = capitalise(error.message)
}) })
} }
valid = await obj.isValid(values) valid = await obj.isValid(values)
} }