Browse Source

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

bug fix for handlebars expression, show budibase version in updates p…
master
Martin McKeaveney 5 years ago
committed by GitHub
parent
commit
45eab69b51
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      packages/builder/src/builderStore/dataBinding.js
  2. 2
      packages/builder/src/components/common/bindings/BindingPanel.svelte
  3. 1
      packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte
  4. 2
      packages/frontend-core/src/api/other.js
  5. 4
      packages/server/src/api/controllers/dev.js

12
packages/builder/src/builderStore/dataBinding.js

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save