bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-06 02:23:51 +00:00
Code Issues Releases Wiki 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;

12
src/Admin/Models/OrganizationViewModel.cs
View File

@@ -11,10 +11,16 @@ namespace Bit.Admin.Models
{
public OrganizationViewModel() { }
public OrganizationViewModel(Organization org, IEnumerable<OrganizationUserUserDetails> orgUsers)
public OrganizationViewModel(Organization org, IEnumerable<OrganizationUserUserDetails> orgUsers,
IEnumerable<Cipher> ciphers, IEnumerable<Collection> collections, IEnumerable<Group> groups,
IEnumerable<Policy> policies)
{
Organization = org;
UserCount = orgUsers.Count();
CipherCount = ciphers.Count();
CollectionCount = collections.Count();
GroupCount = groups?.Count() ?? 0;
PolicyCount = policies?.Count() ?? 0;
Owners = string.Join(", ",
orgUsers
.Where(u => u.Type == OrganizationUserType.Owner && u.Status == OrganizationUserStatusType.Confirmed)
@@ -29,5 +35,9 @@ namespace Bit.Admin.Models
public string Owners { get; set; }
public string Admins { get; set; }
public int UserCount { get; set; }
public int CipherCount { get; set; }
public int CollectionCount { get; set; }
public int GroupCount { get; set; }
public int PolicyCount { get; set; }
}
}