mirror of
https://github.com/bitwarden/server
synced 2025-12-23 19:53:40 +00:00
merge fix
This commit is contained in:
@@ -59,7 +59,7 @@ CREATE PROCEDURE [dbo].[Organization_Create]
|
|||||||
@UseOrganizationDomains BIT = 0,
|
@UseOrganizationDomains BIT = 0,
|
||||||
@UseAdminSponsoredFamilies BIT = 0,
|
@UseAdminSponsoredFamilies BIT = 0,
|
||||||
@SyncSeats BIT = 0,
|
@SyncSeats BIT = 0,
|
||||||
@UseAutomaticUserConfirmation BIT = 0
|
@UseAutomaticUserConfirmation BIT = 0,
|
||||||
@UseDisableSMAdsForUsers BIT = 0
|
@UseDisableSMAdsForUsers BIT = 0
|
||||||
AS
|
AS
|
||||||
BEGIN
|
BEGIN
|
||||||
@@ -127,6 +127,7 @@ BEGIN
|
|||||||
[UseOrganizationDomains],
|
[UseOrganizationDomains],
|
||||||
[UseAdminSponsoredFamilies],
|
[UseAdminSponsoredFamilies],
|
||||||
[SyncSeats],
|
[SyncSeats],
|
||||||
|
[UseAutomaticUserConfirmation],
|
||||||
[UseDisableSMAdsForUsers]
|
[UseDisableSMAdsForUsers]
|
||||||
)
|
)
|
||||||
VALUES
|
VALUES
|
||||||
@@ -191,72 +192,7 @@ BEGIN
|
|||||||
@UseOrganizationDomains,
|
@UseOrganizationDomains,
|
||||||
@UseAdminSponsoredFamilies,
|
@UseAdminSponsoredFamilies,
|
||||||
@SyncSeats,
|
@SyncSeats,
|
||||||
|
@UseAutomaticUserConfirmation,
|
||||||
@UseDisableSMAdsForUsers
|
@UseDisableSMAdsForUsers
|
||||||
)
|
|
||||||
[UseAutomaticUserConfirmation]
|
|
||||||
)
|
|
||||||
VALUES
|
|
||||||
(
|
|
||||||
@Id,
|
|
||||||
@Identifier,
|
|
||||||
@Name,
|
|
||||||
@BusinessName,
|
|
||||||
@BusinessAddress1,
|
|
||||||
@BusinessAddress2,
|
|
||||||
@BusinessAddress3,
|
|
||||||
@BusinessCountry,
|
|
||||||
@BusinessTaxNumber,
|
|
||||||
@BillingEmail,
|
|
||||||
@Plan,
|
|
||||||
@PlanType,
|
|
||||||
@Seats,
|
|
||||||
@MaxCollections,
|
|
||||||
@UsePolicies,
|
|
||||||
@UseSso,
|
|
||||||
@UseGroups,
|
|
||||||
@UseDirectory,
|
|
||||||
@UseEvents,
|
|
||||||
@UseTotp,
|
|
||||||
@Use2fa,
|
|
||||||
@UseApi,
|
|
||||||
@UseResetPassword,
|
|
||||||
@SelfHost,
|
|
||||||
@UsersGetPremium,
|
|
||||||
@Storage,
|
|
||||||
@MaxStorageGb,
|
|
||||||
@Gateway,
|
|
||||||
@GatewayCustomerId,
|
|
||||||
@GatewaySubscriptionId,
|
|
||||||
@ReferenceData,
|
|
||||||
@Enabled,
|
|
||||||
@LicenseKey,
|
|
||||||
@PublicKey,
|
|
||||||
@PrivateKey,
|
|
||||||
@TwoFactorProviders,
|
|
||||||
@ExpirationDate,
|
|
||||||
@CreationDate,
|
|
||||||
@RevisionDate,
|
|
||||||
@OwnersNotifiedOfAutoscaling,
|
|
||||||
@MaxAutoscaleSeats,
|
|
||||||
@UseKeyConnector,
|
|
||||||
@UseScim,
|
|
||||||
@UseCustomPermissions,
|
|
||||||
@UseSecretsManager,
|
|
||||||
@Status,
|
|
||||||
@UsePasswordManager,
|
|
||||||
@SmSeats,
|
|
||||||
@SmServiceAccounts,
|
|
||||||
@MaxAutoscaleSmSeats,
|
|
||||||
@MaxAutoscaleSmServiceAccounts,
|
|
||||||
@SecretsManagerBeta,
|
|
||||||
@LimitCollectionCreation,
|
|
||||||
@LimitCollectionDeletion,
|
|
||||||
@AllowAdminAccessToAllCollectionItems,
|
|
||||||
@UseRiskInsights,
|
|
||||||
@LimitItemDeletion,
|
|
||||||
@UseOrganizationDomains,
|
|
||||||
@UseAdminSponsoredFamilies,
|
|
||||||
@SyncSeats,
|
|
||||||
@UseAutomaticUserConfirmation
|
|
||||||
);
|
);
|
||||||
END
|
END
|
||||||
|
|||||||
Reference in New Issue
Block a user