Merge branch 'master' of github.com:budibase/budibase into budibase-ai-2

This commit is contained in:
Sam Rose 2025-03-25 10:26:42 +00:00
commit b36c64fbde
No known key found for this signature in database
2 changed files with 7 additions and 2 deletions

View File

@ -261,9 +261,13 @@ export class UserDB {
} }
} }
const change = dbUser ? 0 : 1 // no change if there is existing user let change = 1
let creatorsChange = 0 let creatorsChange = 0
if (opts.isAccountHolder || dbUser) {
change = 0
creatorsChange = 1
}
if (dbUser) { if (dbUser) {
const [isDbUserCreator, isUserCreator] = await creatorsInList([ const [isDbUserCreator, isUserCreator] = await creatorsInList([
dbUser, dbUser,

View File

@ -6,6 +6,7 @@ export interface GetLicenseRequest {
// All fields should be optional to cater for // All fields should be optional to cater for
// historical versions of budibase // historical versions of budibase
quotaUsage?: QuotaUsage quotaUsage?: QuotaUsage
tenantId?: string
install: { install: {
id: string id: string
tenantId: string tenantId: string