tsai
/
eventhub
mirror of https://github.com/abpframework/eventhub
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix build for ABP 10.4 upgrade

pull/152/head
Engincan VESKE 3 months ago
parent
622f4523e4
commit
52b43f4eef
10 changed files with 74 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      modules/payment/src/Payment.Admin.Blazor/Pages/Payment/Requests/Index.razor
  2. 2
      src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
  3. 16
      src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor
  4. 6
      src/EventHub.Admin.Web/EventHub.Admin.Web.csproj
  5. 2
      src/EventHub.Admin.Web/Pages/AttendeeDetail.razor
  6. 58
      src/EventHub.Admin.Web/Pages/EventManagement.razor
  7. 48
      src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
  8. 4
      src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor
  9. 2
      src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
  10. 2
      src/EventHub.Web/EventHubWebModule.cs

6
modules/payment/src/Payment.Admin.Blazor/Pages/Payment/Requests/Index.razor
View File

@ -17,7 +17,7 @@
<div id="FilterSection" class="row mt-3"> <div id="FilterSection" class="row mt-3">
<Field ColumnSize="ColumnSize.Is3"> <Field ColumnSize="ColumnSize.Is3">
<FieldLabel>@L["ProductName"]</FieldLabel> <FieldLabel>@L["ProductName"]</FieldLabel>
<TextEdit Placeholder="@L["ProductName"]" @bind-Text="@GetListInput.ProductName"/> <TextInput Placeholder="@L["ProductName"]" @bind-Value="@GetListInput.ProductName"/>
</Field> </Field>
<Field ColumnSize="ColumnSize.Is3"> <Field ColumnSize="ColumnSize.Is3">
<FieldLabel>@L["Status"]</FieldLabel> <FieldLabel>@L["Status"]</FieldLabel>
@ -31,11 +31,11 @@
</Field> </Field>
<Field ColumnSize="ColumnSize.Is3"> <Field ColumnSize="ColumnSize.Is3">
<FieldLabel>@L["MinCreationTime"]</FieldLabel> <FieldLabel>@L["MinCreationTime"]</FieldLabel>
<DateEdit Placeholder="@L["MinCreationTime"]" @bind-Date="@GetListInput.MinCreationTime"/> <DatePicker TValue="DateTime?" Placeholder="@L["MinCreationTime"]" @bind-Value="@GetListInput.MinCreationTime"/>
</Field> </Field>
<Field ColumnSize="ColumnSize.Is3"> <Field ColumnSize="ColumnSize.Is3">
<FieldLabel>@L["MaxCreationTime"]</FieldLabel> <FieldLabel>@L["MaxCreationTime"]</FieldLabel>
<DateEdit Placeholder="@L["MaxCreationTime"]" @bind-Date="@GetListInput.MaxCreationTime"/> <DatePicker TValue="DateTime?" Placeholder="@L["MaxCreationTime"]" @bind-Value="@GetListInput.MaxCreationTime"/>
</Field> </Field>
<Field ColumnSize="ColumnSize.Is12"> <Field ColumnSize="ColumnSize.Is12">
<Row> <Row>

2
src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
View File

@ -17,7 +17,7 @@ using Microsoft.AspNetCore.Localization;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi;
using StackExchange.Redis; using StackExchange.Redis;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc;

16
src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor
View File

@ -1,4 +1,4 @@
@using EventHub.Admin.Users @using EventHub.Admin.Users
@inherits EventHubComponentBase @inherits EventHubComponentBase
@inject IUserAppService UserAppService @inject IUserAppService UserAppService
@ -13,7 +13,7 @@
<Column ColumnSize="ColumnSize.Is12"> <Column ColumnSize="ColumnSize.Is12">
<Field> <Field>
<FieldLabel>@L["UserName"]</FieldLabel> <FieldLabel>@L["UserName"]</FieldLabel>
<TextEdit TValue="string" KeyPress="OnKeyPressed" @bind-Text="@Filter.Username" /> <TextInput TValue="string" KeyPress="OnKeyPressed" @bind-Value="@Filter.Username" />
</Field> </Field>
</Column> </Column>
</div> </div>
@ -30,34 +30,34 @@
<Check TValue="bool" @bind-Checked="@AllUserSelected"></Check> <Check TValue="bool" @bind-Checked="@AllUserSelected"></Check>
</CaptionTemplate> </CaptionTemplate>
<DisplayTemplate> <DisplayTemplate>
@if (SelectAllUsers.ContainsKey(context.Id)) @if (SelectAllUsers.ContainsKey(context.Item.Id))
{ {
<Check TValue="bool" @bind-Checked="@SelectAllUsers[context.Id]"></Check> <Check TValue="bool" @bind-Checked="@SelectAllUsers[context.Item.Id]"></Check>
} }
</DisplayTemplate> </DisplayTemplate>
</DataGridColumn> </DataGridColumn>
<DataGridColumn TItem="UserDto" Field="@nameof(UserDto.Username)" Caption="@L["UserName"].Value"> <DataGridColumn TItem="UserDto" Field="@nameof(UserDto.Username)" Caption="@L["UserName"].Value">
<DisplayTemplate> <DisplayTemplate>
@(context.Username) @(context.Item.Username)
</DisplayTemplate> </DisplayTemplate>
</DataGridColumn> </DataGridColumn>
<DataGridColumn TItem="UserDto" Field="@nameof(UserDto.Name)" Caption="@L["Name"].Value"> <DataGridColumn TItem="UserDto" Field="@nameof(UserDto.Name)" Caption="@L["Name"].Value">
<DisplayTemplate> <DisplayTemplate>
@(context.Name) @(context.Item.Name)
</DisplayTemplate> </DisplayTemplate>
</DataGridColumn> </DataGridColumn>
<DataGridColumn TItem="UserDto" Field="@nameof(UserDto.Surname)" Caption="@L["Surname"].Value"> <DataGridColumn TItem="UserDto" Field="@nameof(UserDto.Surname)" Caption="@L["Surname"].Value">
<DisplayTemplate> <DisplayTemplate>
@(context.Surname) @(context.Item.Surname)
</DisplayTemplate> </DisplayTemplate>
</DataGridColumn> </DataGridColumn>
<DataGridColumn TItem="UserDto" Field="@nameof(UserDto.Email)" Caption="@L["Email"].Value"> <DataGridColumn TItem="UserDto" Field="@nameof(UserDto.Email)" Caption="@L["Email"].Value">
<DisplayTemplate> <DisplayTemplate>
@(context.Email) @(context.Item.Email)
</DisplayTemplate> </DisplayTemplate>
</DataGridColumn> </DataGridColumn>
</DataGridColumns> </DataGridColumns>

6
src/EventHub.Admin.Web/EventHub.Admin.Web.csproj
View File

@ -11,13 +11,15 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.1" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.1.3" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.1" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.1.3" />
<PackageReference Include="IdentityModel" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.9" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.9" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.9" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="10.4.1" />
<PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="10.4.1" /> <PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="10.4.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme" Version="10.4.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme" Version="10.4.1" />
<PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="10.4.1" /> <PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="10.4.1" />

2
src/EventHub.Admin.Web/Pages/AttendeeDetail.razor
View File

@ -35,7 +35,7 @@
<EntityActions TItem="EventAttendeeDto"> <EntityActions TItem="EventAttendeeDto">
<EntityAction TItem="EventAttendeeDto" <EntityAction TItem="EventAttendeeDto"
RequiredPolicy="@EventHubPermissions.Events.Registrations.RemoveAttendee" RequiredPolicy="@EventHubPermissions.Events.Registrations.RemoveAttendee"
Clicked="() => RemoveAttendeeAsync(context)" Clicked="() => RemoveAttendeeAsync(context.Item)"
ConfirmationMessage="@(() => L["AttendeeRemoveConfirmationMessage"])" ConfirmationMessage="@(() => L["AttendeeRemoveConfirmationMessage"])"
Text="@L["RemoveUser"]"> Text="@L["RemoveUser"]">
</EntityAction> </EntityAction>

58
src/EventHub.Admin.Web/Pages/EventManagement.razor
View File

@ -1,4 +1,4 @@
@page "/events" @page "/events"
@using EventHub.Admin.Events @using EventHub.Admin.Events
@using EventHub.Admin.Permissions @using EventHub.Admin.Permissions
@using EventHub.Events @using EventHub.Events
@ -22,37 +22,37 @@
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is3">
<Field> <Field>
<FieldLabel>@L["Title"]</FieldLabel> <FieldLabel>@L["Title"]</FieldLabel>
<TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@Filter.Title"/> <TextInput TValue="string" KeyPress="OnKeyPress" @bind-Value="@Filter.Title"/>
</Field> </Field>
</Column> </Column>
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is3">
<Field> <Field>
<FieldLabel>@L["OrganizationDisplayName"]</FieldLabel> <FieldLabel>@L["OrganizationDisplayName"]</FieldLabel>
<TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@Filter.OrganizationDisplayName"/> <TextInput TValue="string" KeyPress="OnKeyPress" @bind-Value="@Filter.OrganizationDisplayName"/>
</Field> </Field>
</Column> </Column>
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is3">
<Field> <Field>
<FieldLabel>@L["MinStartTime"]</FieldLabel> <FieldLabel>@L["MinStartTime"]</FieldLabel>
<DateEdit TValue="DateTime?" Date="@Filter.MinStartTime" DateChanged="OnSelectedDateChangedForMinStartTime" /> <DatePicker TValue="DateTime?" Value="@Filter.MinStartTime" ValueChanged="OnSelectedDateChangedForMinStartTime" />
</Field> </Field>
</Column> </Column>
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is3">
<Field> <Field>
<FieldLabel>@L["MaxStartTime"]</FieldLabel> <FieldLabel>@L["MaxStartTime"]</FieldLabel>
<DateEdit TValue="DateTime?" Date="@Filter.MaxStartTime" DateChanged="OnSelectedDateChangedForMaxStartTime" /> <DatePicker TValue="DateTime?" Value="@Filter.MaxStartTime" ValueChanged="OnSelectedDateChangedForMaxStartTime" />
</Field> </Field>
</Column> </Column>
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is3">
<Field> <Field>
<FieldLabel>@L["MinAttendeeCount"]</FieldLabel> <FieldLabel>@L["MinAttendeeCount"]</FieldLabel>
<NumericEdit TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MinAttendeeCount"/> <NumericInput TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MinAttendeeCount"/>
</Field> </Field>
</Column> </Column>
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is3">
<Field> <Field>
<FieldLabel>@L["MaxAttendeeCount"]</FieldLabel> <FieldLabel>@L["MaxAttendeeCount"]</FieldLabel>
<NumericEdit TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MaxAttendeeCount"/> <NumericInput TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MaxAttendeeCount"/>
</Field> </Field>
</Column> </Column>
</div> </div>
@ -70,12 +70,12 @@
<EntityActions TItem="EventInListDto"> <EntityActions TItem="EventInListDto">
<EntityAction TItem="EventInListDto" <EntityAction TItem="EventInListDto"
RequiredPolicy="@EventHubPermissions.Events.Update" RequiredPolicy="@EventHubPermissions.Events.Update"
Clicked="() => OpenEditEventModalAsync(context)" Clicked="() => OpenEditEventModalAsync(context.Item)"
Text="@L["Edit"]"> Text="@L["Edit"]">
</EntityAction> </EntityAction>
<EntityAction TItem="EventInListDto" <EntityAction TItem="EventInListDto"
RequiredPolicy="@EventHubPermissions.Events.Registrations.Default" RequiredPolicy="@EventHubPermissions.Events.Registrations.Default"
Clicked="@(() => NavigationManager.NavigateTo($"/event/{context.Id}/attendees"))" Clicked="@(() => NavigationManager.NavigateTo($"/event/{context.Item.Id}/attendees"))"
Text="@L["Attendees"]"> Text="@L["Attendees"]">
</EntityAction> </EntityAction>
</EntityActions> </EntityActions>
@ -126,31 +126,31 @@
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["Title"] *</FieldLabel> <FieldLabel>@L["Title"] *</FieldLabel>
<TextEdit TValue="string" @bind-Text="@EditingEvent.Title"> <TextInput TValue="string" @bind-Value="@EditingEvent.Title">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["Description"] *</FieldLabel> <FieldLabel>@L["Description"] *</FieldLabel>
<MemoEdit @bind-Text="@EditingEvent.Description"> <MemoInput @bind-Value="@EditingEvent.Description">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</MemoEdit> </MemoInput>
</Field> </Field>
</Validation> </Validation>
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["IsOnline"]</FieldLabel> <FieldLabel>@L["IsOnline"]</FieldLabel>
<Select @bind-SelectedValue="@EditingEvent.IsOnline"> <Select TValue="bool" @bind-SelectedValue="@EditingEvent.IsOnline">
<SelectItem Value="@Boolean.TrueString">@L["Online"]</SelectItem> <SelectItem Value="true">@L["Online"]</SelectItem>
<SelectItem Value="@Boolean.FalseString">@L["InPerson"]</SelectItem> <SelectItem Value="false">@L["InPerson"]</SelectItem>
</Select> </Select>
</Field> </Field>
</Validation> </Validation>
@ -158,7 +158,7 @@
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["Language"]</FieldLabel> <FieldLabel>@L["Language"]</FieldLabel>
<Select @bind-SelectedValue="@EditingEvent.Language"> <Select TValue="string" @bind-SelectedValue="@EditingEvent.Language">
@if (Languages != null && Languages.Any()) @if (Languages != null && Languages.Any())
{ {
foreach (var language in Languages) foreach (var language in Languages)
@ -175,11 +175,11 @@
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["OnlineLink"] *</FieldLabel> <FieldLabel>@L["OnlineLink"] *</FieldLabel>
<MemoEdit @bind-Text="@EditingEvent.OnlineLink"> <MemoInput @bind-Value="@EditingEvent.OnlineLink">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</MemoEdit> </MemoInput>
</Field> </Field>
</Validation> </Validation>
} }
@ -188,7 +188,7 @@
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["Country"] *</FieldLabel> <FieldLabel>@L["Country"] *</FieldLabel>
<Select @bind-SelectedValue="@EditingEvent.CountryId"> <Select TValue="Guid?" @bind-SelectedValue="@EditingEvent.CountryId">
@if (Countries != null && Countries.Any()) @if (Countries != null && Countries.Any())
{ {
@foreach (var country in Countries) @foreach (var country in Countries)
@ -203,11 +203,11 @@
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["City"] *</FieldLabel> <FieldLabel>@L["City"] *</FieldLabel>
<TextEdit TValue="string" @bind-Text="@EditingEvent.City"> <TextInput TValue="string" @bind-Value="@EditingEvent.City">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
} }
@ -215,11 +215,11 @@
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["Capacity"]</FieldLabel> <FieldLabel>@L["Capacity"]</FieldLabel>
<NumericEdit TValue="int?" @bind-Value="@EditingEvent.Capacity"> <NumericInput TValue="int?" @bind-Value="@EditingEvent.Capacity">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</NumericEdit> </NumericInput>
</Field> </Field>
</Validation> </Validation>
@ -230,21 +230,21 @@
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["StartTime"] *</FieldLabel> <FieldLabel>@L["StartTime"] *</FieldLabel>
<DateEdit TValue="DateTime" InputMode="DateInputMode.DateTime" @bind-Date="@EditingEvent.StartTime"> <DatePicker TValue="DateTime" InputMode="DateInputMode.DateTime" @bind-Value="@EditingEvent.StartTime">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</DateEdit> </DatePicker>
</Field> </Field>
</Validation> </Validation>
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["EndTime"] *</FieldLabel> <FieldLabel>@L["EndTime"] *</FieldLabel>
<DateEdit TValue="DateTime" InputMode="DateInputMode.DateTime" @bind-Date="@EditingEvent.EndTime"> <DatePicker TValue="DateTime" InputMode="DateInputMode.DateTime" @bind-Value="@EditingEvent.EndTime">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</DateEdit> </DatePicker>
</Field> </Field>
</Validation> </Validation>
</Validations> </Validations>
@ -261,7 +261,7 @@
<Field Horizontal="true"> <Field Horizontal="true">
<FieldLabel ColumnSize="ColumnSize.Is3">@L["ChooseCoverImage"]</FieldLabel> <FieldLabel ColumnSize="ColumnSize.Is3">@L["ChooseCoverImage"]</FieldLabel>
<FieldBody ColumnSize="ColumnSize.Is6"> <FieldBody ColumnSize="ColumnSize.Is6">
<FileEdit MaxMessageSize="@EventConsts.MaxCoverImageFileSize" Filter="@string.Join(", ", EventConsts.AllowedCoverImageExtensions)" Changed="@OnCoverImageFileChanged" AutoReset="true"/> <FileInput MaxMessageSize="@EventConsts.MaxCoverImageFileSize" Filter="@string.Join(", ", EventConsts.AllowedCoverImageExtensions)" Changed="@OnCoverImageFileChanged" AutoReset="true"/>
</FieldBody> </FieldBody>
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is3">
@if (DisabledCoverImageButton) @if (DisabledCoverImageButton)

48
src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
View File

@ -27,28 +27,28 @@
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is3">
<Field> <Field>
<FieldLabel>@L["Name"]</FieldLabel> <FieldLabel>@L["Name"]</FieldLabel>
<TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@Filter.Name"/> <TextInput TValue="string" KeyPress="OnKeyPress" @bind-Value="@Filter.Name"/>
</Field> </Field>
</Column> </Column>
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is3">
<Field> <Field>
<FieldLabel>@L["DisplayName"]</FieldLabel> <FieldLabel>@L["DisplayName"]</FieldLabel>
<TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@Filter.DisplayName"/> <TextInput TValue="string" KeyPress="OnKeyPress" @bind-Value="@Filter.DisplayName"/>
</Field> </Field>
</Column> </Column>
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is3">
<Field> <Field>
<FieldLabel>@L["MinMemberCount"]</FieldLabel> <FieldLabel>@L["MinMemberCount"]</FieldLabel>
<NumericEdit TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MinMemberCount"/> <NumericInput TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MinMemberCount"/>
</Field> </Field>
</Column> </Column>
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is3">
<Field> <Field>
<FieldLabel>@L["MaxMemberCount"]</FieldLabel> <FieldLabel>@L["MaxMemberCount"]</FieldLabel>
<NumericEdit TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MaxMemberCount"/> <NumericInput TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MaxMemberCount"/>
</Field> </Field>
</Column> </Column>
</div> </div>
@ -67,17 +67,17 @@
<EntityActions TItem="OrganizationInListDto"> <EntityActions TItem="OrganizationInListDto">
<EntityAction TItem="OrganizationInListDto" <EntityAction TItem="OrganizationInListDto"
RequiredPolicy="@EventHubPermissions.Organizations.Memberships.Default" RequiredPolicy="@EventHubPermissions.Organizations.Memberships.Default"
Clicked="@(() => NavigationManager.NavigateTo($"/organization-memberships/{context.Id}"))" Clicked="@(() => NavigationManager.NavigateTo($"/organization-memberships/{context.Item.Id}"))"
Text="@L["Members"]"> Text="@L["Members"]">
</EntityAction> </EntityAction>
<EntityAction TItem="OrganizationInListDto" <EntityAction TItem="OrganizationInListDto"
RequiredPolicy="@EventHubPermissions.Organizations.Update" RequiredPolicy="@EventHubPermissions.Organizations.Update"
Clicked="() => OpenEditOrganizationModalAsync(context)" Clicked="() => OpenEditOrganizationModalAsync(context.Item)"
Text="@L["Edit"]"> Text="@L["Edit"]">
</EntityAction> </EntityAction>
<EntityAction TItem="OrganizationInListDto" <EntityAction TItem="OrganizationInListDto"
RequiredPolicy="@EventHubPermissions.Organizations.Delete" RequiredPolicy="@EventHubPermissions.Organizations.Delete"
Clicked="() => DeleteOrganizationAsync(context)" Clicked="() => DeleteOrganizationAsync(context.Item)"
ConfirmationMessage="@(() => L["DeleteConfirmationMessage"])" ConfirmationMessage="@(() => L["DeleteConfirmationMessage"])"
Text="@L["Delete"]"> Text="@L["Delete"]">
</EntityAction> </EntityAction>
@ -125,66 +125,66 @@
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["DisplayName"] *</FieldLabel> <FieldLabel>@L["DisplayName"] *</FieldLabel>
<TextEdit TValue="string" @bind-Text="@EditingOrganization.DisplayName"> <TextInput TValue="string" @bind-Value="@EditingOrganization.DisplayName">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["Description"] *</FieldLabel> <FieldLabel>@L["Description"] *</FieldLabel>
<MemoEdit Rows="4" TValue="string" @bind-Text="@EditingOrganization.Description"> <MemoInput Rows="4" TValue="string" @bind-Value="@EditingOrganization.Description">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</MemoEdit> </MemoInput>
</Field> </Field>
</Validation> </Validation>
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["Website"]</FieldLabel> <FieldLabel>@L["Website"]</FieldLabel>
<TextEdit TValue="string" @bind-Text="@EditingOrganization.Website"> <TextInput TValue="string" @bind-Value="@EditingOrganization.Website">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["TwitterUsername"]</FieldLabel> <FieldLabel>@L["TwitterUsername"]</FieldLabel>
<TextEdit TValue="string" @bind-Text="@EditingOrganization.TwitterUsername"> <TextInput TValue="string" @bind-Value="@EditingOrganization.TwitterUsername">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["GitHubUsername"]</FieldLabel> <FieldLabel>@L["GitHubUsername"]</FieldLabel>
<TextEdit TValue="string" @bind-Text="@EditingOrganization.GitHubUsername"> <TextInput TValue="string" @bind-Value="@EditingOrganization.GitHubUsername">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["FacebookUsername"]</FieldLabel> <FieldLabel>@L["FacebookUsername"]</FieldLabel>
<TextEdit TValue="string" @bind-Text="@EditingOrganization.FacebookUsername"> <TextInput TValue="string" @bind-Value="@EditingOrganization.FacebookUsername">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
@ -192,22 +192,22 @@
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["InstagramUsername"]</FieldLabel> <FieldLabel>@L["InstagramUsername"]</FieldLabel>
<TextEdit TValue="string" @bind-Text="@EditingOrganization.InstagramUsername"> <TextInput TValue="string" @bind-Value="@EditingOrganization.InstagramUsername">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation> <Validation>
<Field> <Field>
<FieldLabel>@L["MediumUsername"]</FieldLabel> <FieldLabel>@L["MediumUsername"]</FieldLabel>
<TextEdit TValue="string" @bind-Text="@EditingOrganization.MediumUsername"> <TextInput TValue="string" @bind-Value="@EditingOrganization.MediumUsername">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
@ -236,7 +236,7 @@
<Field Horizontal="true"> <Field Horizontal="true">
<FieldLabel ColumnSize="ColumnSize.Is3">@L["ChooseProfileImage"]</FieldLabel> <FieldLabel ColumnSize="ColumnSize.Is3">@L["ChooseProfileImage"]</FieldLabel>
<FieldBody ColumnSize="ColumnSize.Is6"> <FieldBody ColumnSize="ColumnSize.Is6">
<FileEdit MaxMessageSize="@OrganizationConsts.MaxProfilePictureFileSize" Filter="@string.Join(", ", OrganizationConsts.AllowedProfilePictureExtensions)" Changed="@OnProfileImageFileChanged" Progressed="@OnProgressedForProfileImage" AutoReset="true"/> <FileInput MaxMessageSize="@OrganizationConsts.MaxProfilePictureFileSize" Filter="@string.Join(", ", OrganizationConsts.AllowedProfilePictureExtensions)" Changed="@OnProfileImageFileChanged" Progressed="@OnProgressedForProfileImage" AutoReset="true"/>
</FieldBody> </FieldBody>
<Column ColumnSize="ColumnSize.Is3"> <Column ColumnSize="ColumnSize.Is3">
@if (DisabledProfileImageButton) @if (DisabledProfileImageButton)

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

@ -25,14 +25,14 @@
<Column ColumnSize="ColumnSize.Is6"> <Column ColumnSize="ColumnSize.Is6">
<Field> <Field>
<FieldLabel>@L["OrganizationName"]</FieldLabel> <FieldLabel>@L["OrganizationName"]</FieldLabel>
<TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@OrganizationName"/> <TextInput TValue="string" KeyPress="OnKeyPress" @bind-Value="@OrganizationName"/>
</Field> </Field>
</Column> </Column>
<Column ColumnSize="ColumnSize.Is6"> <Column ColumnSize="ColumnSize.Is6">
<Field> <Field>
<FieldLabel>@L["UserName"]</FieldLabel> <FieldLabel>@L["UserName"]</FieldLabel>
<TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@Filter.UserName"/> <TextInput TValue="string" KeyPress="OnKeyPress" @bind-Value="@Filter.UserName"/>
</Field> </Field>
</Column> </Column>
</Row> </Row>

2
src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
View File

@ -19,7 +19,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi;
using StackExchange.Redis; using StackExchange.Redis;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc;

2
src/EventHub.Web/EventHubWebModule.cs
View File

@ -14,7 +14,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.IdentityModel.Protocols.OpenIdConnect; using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi;
using Payment.Web; using Payment.Web;
using StackExchange.Redis; using StackExchange.Redis;
using Volo.Abp; using Volo.Abp;

Write Preview
Loading…
Cancel
Save