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

Merge pull request #4546 from Budibase/fix/various-fixes 

bug fix for handlebars expression, show budibase version in updates p…
This commit is contained in:
Martin McKeaveney 2022-02-17 11:20:35 +01:00 committed by GitHub
parent bfaca430da 945ea9e0d8
commit e148add1b6
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -536,12 +536,14 @@ export const getSchemaForDatasource = (asset, datasource, options) => {
} }
// Add schema properties if required // Add schema properties if required
if (schema) {
if (addId) { if (addId) {
schema["_id"] = { type: "string" } schema["_id"] = { type: "string" }
} }
if (addRev) { if (addRev) {
schema["_rev"] = { type: "string" } schema["_rev"] = { type: "string" }
} }
}
// Ensure there are "name" properties for all fields and that field schema // Ensure there are "name" properties for all fields and that field schema
// are objects // are objects

2
packages/builder/src/components/common/bindings/BindingPanel.svelte
View File

@ -58,7 +58,7 @@
const updateValue = val => { const updateValue = val => {
valid = isValid(readableToRuntimeBinding(bindings, val)) valid = isValid(readableToRuntimeBinding(bindings, val))
if (valid) { if (valid) {
dispatch("change", value) dispatch("change", val)
} }
} }

1
packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte
View File

@ -74,6 +74,7 @@
} }
draftScreen.routing.route = route draftScreen.routing.route = route
draftScreen.routing.roleId = roleId
await store.actions.screens.save(draftScreen) await store.actions.screens.save(draftScreen)
if (draftScreen.props._instanceName.endsWith("List")) { if (draftScreen.props._instanceName.endsWith("List")) {

2
packages/frontend-core/src/api/other.js
View File

@ -32,7 +32,7 @@ export const buildOtherEndpoints = API => ({
getBudibaseVersion: async () => { getBudibaseVersion: async () => {
return await API.get({ return await API.get({
url: "/api/dev/version", url: "/api/dev/version",
}) }).version
}, },
/** /**

4
packages/server/src/api/controllers/dev.js
View File

@ -118,5 +118,7 @@ exports.revert = async ctx => {
} }
exports.getBudibaseVersion = async ctx => { exports.getBudibaseVersion = async ctx => {
ctx.body = require("../../../package.json").version ctx.body = {
version: require("../../../package.json").version,
}
} }