Browse Source

fix(Admin): bad indentation

pull/49/head
Berkan Sasmaz 5 years ago
parent
commit
9895a1ddfb
  1. 4
      src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor
  2. 28
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/Organizations/Memberships/OrganizationMembershipRepository.cs

4
src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor

@ -23,14 +23,14 @@
<CardBody> <CardBody>
<div id="FilterSection" class="mt-3 ml-2"> <div id="FilterSection" class="mt-3 ml-2">
<Row> <Row>
<Column ColumnSize="ColumnSize.Is5"> <Column ColumnSize="ColumnSize.Is6">
<Field> <Field>
<FieldLabel>@L["OrganizationName"]</FieldLabel> <FieldLabel>@L["OrganizationName"]</FieldLabel>
<TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@OrganizationName"/> <TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@OrganizationName"/>
</Field> </Field>
</Column> </Column>
<Column ColumnSize="ColumnSize.Is5"> <Column ColumnSize="ColumnSize.Is6">
<Field> <Field>
<FieldLabel>@L["UserName"]</FieldLabel> <FieldLabel>@L["UserName"]</FieldLabel>
<TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@Filter.UserName"/> <TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@Filter.UserName"/>

28
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/Organizations/Memberships/OrganizationMembershipRepository.cs

@ -12,17 +12,18 @@ using Volo.Abp.Identity;
namespace EventHub.EntityFrameworkCore.Organizations.Memberships namespace EventHub.EntityFrameworkCore.Organizations.Memberships
{ {
public class OrganizationMembershipRepository : EfCoreRepository<EventHubDbContext, OrganizationMembership, Guid>, IOrganizationMembershipRepository public class OrganizationMembershipRepository : EfCoreRepository<EventHubDbContext, OrganizationMembership, Guid>,
IOrganizationMembershipRepository
{ {
public OrganizationMembershipRepository(IDbContextProvider<EventHubDbContext> dbContextProvider) : base(dbContextProvider) public OrganizationMembershipRepository(IDbContextProvider<EventHubDbContext> dbContextProvider)
: base(dbContextProvider)
{ {
} }
public async Task<List<OrganizationMemberWithDetails>> GetMemberListAsync( public async Task<List<OrganizationMemberWithDetails>> GetMemberListAsync(
Guid? organizationId, Guid? organizationId,
Guid? userId, Guid? userId,
int skipCount, int skipCount,
int maxResultCount, int maxResultCount,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
@ -31,14 +32,15 @@ namespace EventHub.EntityFrameworkCore.Organizations.Memberships
var organizationMembershipsDbSet = dbContext.Set<OrganizationMembership>(); var organizationMembershipsDbSet = dbContext.Set<OrganizationMembership>();
var identityUserDbSet = dbContext.Set<IdentityUser>(); var identityUserDbSet = dbContext.Set<IdentityUser>();
var organizationDbSet = dbContext.Set<Organization>(); var organizationDbSet = dbContext.Set<Organization>();
var query = organizationMembershipsDbSet var query = organizationMembershipsDbSet
.Join(organizationDbSet, t => t.OrganizationId, organization => organization.Id .Join(organizationDbSet, t => t.OrganizationId, organization => organization.Id,
, (organizationMember, organization) => new {organizationMember, organization}) (organizationMember, organization) => new {organizationMember, organization})
.Join(identityUserDbSet, organizationWithMember => organizationWithMember.organizationMember.UserId, user => user.Id, .Join(identityUserDbSet, organizationWithMember => organizationWithMember.organizationMember.UserId,
(organizationWithMember, user) => new {organizationWithMember, user}) user => user.Id, (organizationWithMember, user) => new {organizationWithMember, user})
.WhereIf(userId.HasValue, t => t.user.Id == userId) .WhereIf(userId.HasValue, t => t.user.Id == userId)
.WhereIf(organizationId.HasValue, t => t.organizationWithMember.organizationMember.OrganizationId == organizationId) .WhereIf(organizationId.HasValue,
t => t.organizationWithMember.organizationMember.OrganizationId == organizationId)
.OrderByDescending(o => o.organizationWithMember.organizationMember.CreationTime) .OrderByDescending(o => o.organizationWithMember.organizationMember.CreationTime)
.Select(t => new OrganizationMemberWithDetails .Select(t => new OrganizationMemberWithDetails
{ {
@ -48,14 +50,14 @@ namespace EventHub.EntityFrameworkCore.Organizations.Memberships
Name = t.user.Name, Name = t.user.Name,
Surname = t.user.Surname Surname = t.user.Surname
}); });
return await query return await query
.PageBy(skipCount, maxResultCount) .PageBy(skipCount, maxResultCount)
.ToListAsync(GetCancellationToken(cancellationToken)); .ToListAsync(GetCancellationToken(cancellationToken));
} }
public async Task<int> GetCountAsync( public async Task<int> GetCountAsync(
Guid? organizationId, Guid? organizationId,
Guid? userId, Guid? userId,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {

Loading…
Cancel
Save