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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
13 additions and
8 deletions
-
packages/builder/src/builderStore/dataBinding.js
-
packages/builder/src/components/common/bindings/BindingPanel.svelte
-
packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte
-
packages/frontend-core/src/api/other.js
-
packages/server/src/api/controllers/dev.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
|
|
|
|
|
|
|
|
@ -58,7 +58,7 @@ |
|
|
|
const updateValue = val => { |
|
|
|
valid = isValid(readableToRuntimeBinding(bindings, val)) |
|
|
|
if (valid) { |
|
|
|
dispatch("change", value) |
|
|
|
dispatch("change", val) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -74,6 +74,7 @@ |
|
|
|
} |
|
|
|
|
|
|
|
draftScreen.routing.route = route |
|
|
|
draftScreen.routing.roleId = roleId |
|
|
|
|
|
|
|
await store.actions.screens.save(draftScreen) |
|
|
|
if (draftScreen.props._instanceName.endsWith("List")) { |
|
|
|
|
|
|
|
@ -32,7 +32,7 @@ export const buildOtherEndpoints = API => ({ |
|
|
|
getBudibaseVersion: async () => { |
|
|
|
return await API.get({ |
|
|
|
url: "/api/dev/version", |
|
|
|
}) |
|
|
|
}).version |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
@ -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, |
|
|
|
} |
|
|
|
} |
|
|
|
|