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

Merge pull request #1588 from Budibase/fix/no-page-load 

Fix/no page load
This commit is contained in:
Michael Drury 2021-05-28 20:03:57 +01:00 committed by GitHub
parent 4e91f3e144 71834d01c6
commit b5d1429c9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1310 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
View File

@ -291,7 +291,7 @@
/> />
{#if relationshipOptions && relationshipOptions.length > 0} {#if relationshipOptions && relationshipOptions.length > 0}
<RadioGroup <RadioGroup
disabled={originalName} disabled={originalName != null}
label="Define the relationship" label="Define the relationship"
bind:value={field.relationshipType} bind:value={field.relationshipType}
options={relationshipOptions} options={relationshipOptions}

6
packages/server/src/utilities/workerRequests.js
View File

@ -9,7 +9,8 @@ function getAppRole(appId, user) {
if (!user.roles) { if (!user.roles) {
return user return user
} }
user.roleId = user.roles[appId] // always use the deployed app
user.roleId = user.roles[getDeployedAppID(appId)]
if (!user.roleId) { if (!user.roleId) {
user.roleId = BUILTIN_ROLE_IDS.PUBLIC user.roleId = BUILTIN_ROLE_IDS.PUBLIC
} }
@ -97,8 +98,6 @@ exports.deleteGlobalUser = async (ctx, globalId) => {
} }
exports.getGlobalUsers = async (ctx, appId = null, globalId = null) => { exports.getGlobalUsers = async (ctx, appId = null, globalId = null) => {
// always use the deployed app
appId = getDeployedAppID(appId)
const endpoint = globalId const endpoint = globalId
? `/api/admin/users/${globalId}` ? `/api/admin/users/${globalId}`
: `/api/admin/users` : `/api/admin/users`
@ -136,7 +135,6 @@ exports.getGlobalSelf = async (ctx, appId = null) => {
} }
exports.addAppRoleToUser = async (ctx, appId, roleId, userId = null) => { exports.addAppRoleToUser = async (ctx, appId, roleId, userId = null) => {
appId = getDeployedAppID(appId)
let user, let user,
endpoint, endpoint,
body = {} body = {}

1318
packages/server/yarn.lock
View File

File diff suppressed because it is too large Load Diff

3
packages/standard-components/src/forms/validation.js
View File

@ -77,6 +77,9 @@ const lengthConstraint = maxLength => value => {
} }
const numericalConstraint = (constraint, error) => value => { const numericalConstraint = (constraint, error) => value => {
if (value == null || value === "") {
return null
}
if (isNaN(value)) { if (isNaN(value)) {
return "Must be a number" return "Must be a number"
} }