nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-07 19:05:07 -05:00
Code Activity

[AC-1588] Fix Bitwarden Portal Secrets Manager flag not working (#3178)

Browse Source 
* Fix SM Configuration not showing properly

* Undo unnecessary changes

* Undo unnecessary change

* Undo unnecessary change
This commit is contained in:
Thomas Rittson
2023-08-11 10:16:59 +10:00
committed by GitHub
parent 6b47c3c8d9
commit 09e396a2d2
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Admin/Views/Shared/_OrganizationFormScripts.cshtml
View File

@ -6,7 +6,7 @@
document.getElementById('@(nameof(Model.Plan))').value = selectText; document.getElementById('@(nameof(Model.Plan))').value = selectText;
togglePlanSettings(selectEl.options[selectEl.selectedIndex].value); togglePlanSettings(selectEl.options[selectEl.selectedIndex].value);
}); });
document.getElementById('gateway-customer-link').addEventListener('click', () => { document.getElementById('gateway-customer-link')?.addEventListener('click', () => {
const gateway = document.getElementById('@(nameof(Model.Gateway))'); const gateway = document.getElementById('@(nameof(Model.Gateway))');
const customerId = document.getElementById('@(nameof(Model.GatewayCustomerId))'); const customerId = document.getElementById('@(nameof(Model.GatewayCustomerId))');
if (!gateway || gateway.value === '' || !customerId || customerId.value === '') { if (!gateway || gateway.value === '' || !customerId || customerId.value === '') {
@ -19,7 +19,7 @@
+ customerId.value, '_blank'); + customerId.value, '_blank');
} }
}); });
document.getElementById('gateway-subscription-link').addEventListener('click', () => { document.getElementById('gateway-subscription-link')?.addEventListener('click', () => {
const gateway = document.getElementById('@(nameof(Model.Gateway))'); const gateway = document.getElementById('@(nameof(Model.Gateway))');
const subId = document.getElementById('@(nameof(Model.GatewaySubscriptionId))'); const subId = document.getElementById('@(nameof(Model.GatewaySubscriptionId))');
if (!gateway || gateway.value === '' || !subId || subId.value === '') { if (!gateway || gateway.value === '' || !subId || subId.value === '') {
@ -34,24 +34,24 @@
}); });
document.getElementById('@(nameof(Model.UseSecretsManager))').addEventListener('change', (event) => { document.getElementById('@(nameof(Model.UseSecretsManager))').addEventListener('change', (event) => {
document.getElementById('organization-secrets-configuration').hidden = !event.target.checked; document.getElementById('organization-secrets-configuration').hidden = !event.target.checked;
if (event.target.checked) { if (event.target.checked) {
return; return;
} }
document.getElementById('@(nameof(Model.SmSeats))').value = ''; document.getElementById('@(nameof(Model.SmSeats))').value = '';
document.getElementById('@(nameof(Model.MaxAutoscaleSmSeats))').value = ''; document.getElementById('@(nameof(Model.MaxAutoscaleSmSeats))').value = '';
document.getElementById('@(nameof(Model.SmServiceAccounts))').value = ''; document.getElementById('@(nameof(Model.SmServiceAccounts))').value = '';
document.getElementById('@(nameof(Model.MaxAutoscaleSmServiceAccounts))').value = ''; document.getElementById('@(nameof(Model.MaxAutoscaleSmServiceAccounts))').value = '';
}); });
})(); })();
function togglePlanSettings(planType) { function togglePlanSettings(planType) {
document.getElementById('@(nameof(Model.PlanType))').value = planType; document.getElementById('@(nameof(Model.PlanType))').value = planType;
switch(planType) { switch(planType) {
case '@((byte)Bit.Core.Enums.PlanType.TeamsMonthly)': case '@((byte)Bit.Core.Enums.PlanType.TeamsMonthly)':
case '@((byte)Bit.Core.Enums.PlanType.TeamsAnnually)': case '@((byte)Bit.Core.Enums.PlanType.TeamsAnnually)':
// Plan // Plan
document.getElementById('@(nameof(Model.Seats))').value = '10'; document.getElementById('@(nameof(Model.Seats))').value = '10';
document.getElementById('@(nameof(Model.MaxCollections))').value = ''; document.getElementById('@(nameof(Model.MaxCollections))').value = '';
document.getElementById('@(nameof(Model.MaxStorageGb))').value = '1'; document.getElementById('@(nameof(Model.MaxStorageGb))').value = '1';
@ -66,7 +66,7 @@
document.getElementById('@(nameof(Model.UseDirectory))').checked = true; document.getElementById('@(nameof(Model.UseDirectory))').checked = true;
document.getElementById('@(nameof(Model.UseEvents))').checked = true; document.getElementById('@(nameof(Model.UseEvents))').checked = true;
document.getElementById('@(nameof(Model.UsersGetPremium))').checked = true; document.getElementById('@(nameof(Model.UsersGetPremium))').checked = true;
document.getElementById('@(nameof(Model.UseCustomPermissions))').checked = false; document.getElementById('@(nameof(Model.UseCustomPermissions))').checked = false;
document.getElementById('@(nameof(Model.UseTotp))').checked = true; document.getElementById('@(nameof(Model.UseTotp))').checked = true;
document.getElementById('@(nameof(Model.Use2fa))').checked = true; document.getElementById('@(nameof(Model.Use2fa))').checked = true;
document.getElementById('@(nameof(Model.UseApi))').checked = true; document.getElementById('@(nameof(Model.UseApi))').checked = true;
@ -78,7 +78,7 @@
document.getElementById('@(nameof(Model.ExpirationDate))').value = '@Model.FourteenDayExpirationDate'; document.getElementById('@(nameof(Model.ExpirationDate))').value = '@Model.FourteenDayExpirationDate';
document.getElementById('@(nameof(Model.SalesAssistedTrialStarted))').value = true; document.getElementById('@(nameof(Model.SalesAssistedTrialStarted))').value = true;
break; break;
case '@((byte)Bit.Core.Enums.PlanType.EnterpriseMonthly)': case '@((byte)Bit.Core.Enums.PlanType.EnterpriseMonthly)':
case '@((byte)Bit.Core.Enums.PlanType.EnterpriseAnnually)': case '@((byte)Bit.Core.Enums.PlanType.EnterpriseAnnually)':
// Plan // Plan
@ -109,6 +109,6 @@
document.getElementById('@(nameof(Model.SalesAssistedTrialStarted))').value = true; document.getElementById('@(nameof(Model.SalesAssistedTrialStarted))').value = true;
break; break;
} }
} }
</script> </script>