mirror of
https://github.com/bitwarden/server
synced 2026-01-19 00:43:47 +00:00
[SM-1570] Adding new item to organization license to disable SM ads for users (#6482)
* Adding new item to organization license * fixing whitespace issues * fixing missing comment * fixing merge conflicts * merge fix * db merge fixes * fix * Updating SM to Sm, and adding more view refreshes * fixing merge conflicts * Redoing migration * Update OrganizationLicense.cs * Update OrganizationLicense.cs * fixes * fixes * fixing db issues * fix * rearranging sql after merge conflicts * Merge conflicts with dbscripts are fixed, adding missing usedisableSMadsForUsers where needed * removing incorrect merge fix * fixes * adding feature flag to disable sm ads --------- Co-authored-by: Conner Turnbull <cturnbull@bitwarden.com>
This commit is contained in:
@@ -60,7 +60,8 @@ CREATE PROCEDURE [dbo].[Organization_Create]
|
||||
@UseAdminSponsoredFamilies BIT = 0,
|
||||
@SyncSeats BIT = 0,
|
||||
@UseAutomaticUserConfirmation BIT = 0,
|
||||
@UsePhishingBlocker BIT = 0
|
||||
@UsePhishingBlocker BIT = 0,
|
||||
@UseDisableSmAdsForUsers BIT = 0
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
@@ -129,7 +130,8 @@ BEGIN
|
||||
[SyncSeats],
|
||||
[UseAutomaticUserConfirmation],
|
||||
[UsePhishingBlocker],
|
||||
[MaxStorageGbIncreased]
|
||||
[MaxStorageGbIncreased],
|
||||
[UseDisableSmAdsForUsers]
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
@@ -195,6 +197,7 @@ BEGIN
|
||||
@SyncSeats,
|
||||
@UseAutomaticUserConfirmation,
|
||||
@UsePhishingBlocker,
|
||||
@MaxStorageGb
|
||||
@MaxStorageGb,
|
||||
@UseDisableSmAdsForUsers
|
||||
);
|
||||
END
|
||||
|
||||
Reference in New Issue
Block a user