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

Add additional meta data to org view (#655)

Browse Source 
* Add additional meta data to org view

* null check policies and groups
This commit is contained in:
Kyle Spearrin
2020-02-25 14:28:41 -05:00
committed by GitHub
parent 927f073362
commit 5b598b811e
4 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Admin/Models/OrganizationEditModel.cs
View File

@ -15,8 +15,9 @@ namespace Bit.Admin.Models
public OrganizationEditModel() { }
public OrganizationEditModel(Organization org, IEnumerable<OrganizationUserUserDetails> orgUsers,
BillingInfo billingInfo, GlobalSettings globalSettings)
: base(org, orgUsers)
IEnumerable<Cipher> ciphers, IEnumerable<Collection> collections, IEnumerable<Group> groups,
IEnumerable<Policy> policies, BillingInfo billingInfo, GlobalSettings globalSettings)
: base(org, orgUsers, ciphers, collections, groups, policies)
{
BillingInfo = billingInfo;
BraintreeMerchantId = globalSettings.Braintree.MerchantId;