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

Merge branch 'next' into admin/user-management-ui

This commit is contained in:
Keviin Åberg Kultalahti 2021-05-18 12:27:46 +02:00
parent 038369f736 d9ed0686ab
commit 39d5e4ef45
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/builder/src/components/deploy/DeployModal.svelte
View File

@ -61,6 +61,7 @@
// Required to check any updated deployment statuses between polls // Required to check any updated deployment statuses between polls
function checkIncomingDeploymentStatus(current, incoming) { function checkIncomingDeploymentStatus(current, incoming) {
console.log(current, incoming)
for (let incomingDeployment of incoming) { for (let incomingDeployment of incoming) {
if ( if (
incomingDeployment.status === DeploymentStatus.FAILURE || incomingDeployment.status === DeploymentStatus.FAILURE ||

2
packages/builder/src/pages/builder/portal/apps/index.svelte
View File

@ -62,7 +62,7 @@
} }
const openApp = app => { const openApp = app => {
if (app.lockedBy && app.lockedBy?.email === $auth.user?.email) { if (app.lockedBy && app.lockedBy?.email !== $auth.user?.email) {
notifications.error( notifications.error(
`App locked by ${app.lockedBy.email}. Please allow lock to expire or have them unlock this app.` `App locked by ${app.lockedBy.email}. Please allow lock to expire or have them unlock this app.`
) )

2
packages/server/src/api/controllers/application.js
View File

@ -244,7 +244,7 @@ exports.delete = async function (ctx) {
} }
const createEmptyAppPackage = async (ctx, app) => { const createEmptyAppPackage = async (ctx, app) => {
const db = new CouchDB(app.instance._id) const db = new CouchDB(app.appId)
let screensAndLayouts = [] let screensAndLayouts = []
for (let layout of BASE_LAYOUTS) { for (let layout of BASE_LAYOUTS) {

2
packages/worker/src/api/controllers/app.js
View File

@ -29,7 +29,7 @@ exports.getApps = async ctx => {
let url = app.url || encodeURI(`${app.name}`) let url = app.url || encodeURI(`${app.name}`)
url = `/${url.replace(URL_REGEX_SLASH, "")}` url = `/${url.replace(URL_REGEX_SLASH, "")}`
body[url] = { body[url] = {
appId: app.instance._id, appId: app.appId,
name: app.name, name: app.name,
url, url,
} }