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

Merge branch 'new-backend' of github.com:Budibase/budibase into new-backend

This commit is contained in:
Michael Shanks 2020-03-25 11:29:12 +00:00
parent 9e6e471a38 ecf324453e
commit 4c5e5f9716
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/database/IndexView.svelte
View File

@ -23,7 +23,7 @@
isallowed: index.allowedRecordNodeIds.some(id => node.nodeId === id), isallowed: index.allowedRecordNodeIds.some(id => node.nodeId === id),
})), })),
filter(hierarchyFunctions.isRecord), filter(hierarchyFunctions.isRecord),
filter(hierarchyFunctions.isDecendant(index.parent())), filter(hierarchyFunctions.isDecendant($store.currentNode.parent())),
hierarchyFunctions.getFlattenedHierarchy hierarchyFunctions.getFlattenedHierarchy
) )

4
packages/builder/src/database/ModelDataTable/api.js
View File

@ -1,9 +1,9 @@
import api from "../../builderStore/api" import api from "../../builderStore/api"
import { getNewRecord, getNewInstance } from "../../common/core" import { getNewRecord, getNewInstance } from "../../common/core"
export async function createUser(user, { appname, instanceId }) { export async function createUser(password, user, { appname, instanceId }) {
const CREATE_USER_URL = `/_builder/instance/${appname}/${instanceId}/api/createUser` const CREATE_USER_URL = `/_builder/instance/${appname}/${instanceId}/api/createUser`
const response = await api.post(CREATE_USER_URL, user) const response = await api.post(CREATE_USER_URL, { user, password })
return await response.json() return await response.json()
} }

3
packages/builder/src/database/ModelDataTable/modals/CreateUser.svelte
View File

@ -18,11 +18,12 @@
async function createUser() { async function createUser() {
const response = await api.createUser( const response = await api.createUser(
password,
{ {
username, username,
password,
accessLevels, accessLevels,
enabled: true, enabled: true,
temporaryAccessId: ""
}, },
currentAppInfo currentAppInfo
) )