Browse Source

fixed build problems in account module for MudBlazor

pull/25235/head
İsmail ÇAĞDAŞ 8 months ago
parent
commit
7358786ffb
  1. 1
      modules/account/Volo.Abp.Account.slnx
  2. 2
      modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/AbpAccountBlazorMudBlazorModule.cs
  3. 7
      modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor
  4. 18
      modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor.cs
  5. 1
      modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/_Imports.razor

1
modules/account/Volo.Abp.Account.slnx

@ -2,6 +2,7 @@
<Folder Name="/src/"> <Folder Name="/src/">
<Project Path="src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.csproj" /> <Project Path="src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.csproj" />
<Project Path="src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.csproj" /> <Project Path="src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.csproj" />
<Project Path="src/Volo.Abp.Account.Blazor.MudBlazor/Volo.Abp.Account.Blazor.MudBlazor.csproj" />
<Project Path="src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj" /> <Project Path="src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj" />
<Project Path="src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.csproj" /> <Project Path="src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.csproj" />
<Project Path="src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.csproj" /> <Project Path="src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.csproj" />

2
modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/AbpAccountBlazorMudBlazorModule.cs

@ -1,7 +1,7 @@
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.Account.Blazor.MudBlazor.Pages.Account; using Volo.Abp.Account.Blazor.MudBlazor.Pages.Account;
using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor; using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor;
using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
using Volo.Abp.Mapperly; using Volo.Abp.Mapperly;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Volo.Abp.ObjectExtending; using Volo.Abp.ObjectExtending;

7
modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor

@ -1,14 +1,9 @@
@page "/account/manage-profile" @page "/account/manage-profile"
@using Microsoft.AspNetCore.Components.Forms @using global::MudBlazor
@using Microsoft.Extensions.Localization
@using Volo.Abp.Account.Localization @using Volo.Abp.Account.Localization
@using Volo.Abp.AspNetCore.Components.Web
@using Volo.Abp.MudBlazorUI.Components.ObjectExtending @using Volo.Abp.MudBlazorUI.Components.ObjectExtending
@using Volo.Abp.ObjectExtending @using Volo.Abp.ObjectExtending
@using Volo.Abp.Data
@using Volo.Abp.Identity
@inject IStringLocalizer<AccountResource> Localizer
@inherits AbpAccountComponentBase @inherits AbpAccountComponentBase
<MudGrid> <MudGrid>

18
modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor.cs

@ -2,6 +2,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using Microsoft.Extensions.Localization; using Microsoft.Extensions.Localization;
using MudBlazor; using MudBlazor;
using Volo.Abp.Account.Localization;
using Volo.Abp.AspNetCore.Components.Messages; using Volo.Abp.AspNetCore.Components.Messages;
using Volo.Abp.Identity; using Volo.Abp.Identity;
using Volo.Abp.MudBlazorUI; using Volo.Abp.MudBlazorUI;
@ -50,7 +51,13 @@ public partial class AccountManage
protected async Task ChangePasswordAsync() protected async Task ChangePasswordAsync()
{ {
if (_changePasswordForm == null || !await _changePasswordForm.Validate()) if (_changePasswordForm == null)
{
return;
}
await _changePasswordForm.Validate();
if (!_changePasswordForm.IsValid)
{ {
return; return;
} }
@ -85,11 +92,18 @@ public partial class AccountManage
protected virtual async Task UpdatePersonalInfoAsync() protected virtual async Task UpdatePersonalInfoAsync()
{ {
if (_personalInfoForm == null || !await _personalInfoForm.Validate()) if (_personalInfoForm == null)
{ {
return; return;
} }
await _personalInfoForm.Validate();
if (!_personalInfoForm.IsValid)
{
return;
}
if (PersonalInfoModel == null) if (PersonalInfoModel == null)
{ {
return; return;

1
modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/_Imports.razor

@ -3,4 +3,3 @@
@using Volo.Abp.MudBlazorUI @using Volo.Abp.MudBlazorUI
@using Volo.Abp.MudBlazorUI.Components @using Volo.Abp.MudBlazorUI.Components
@using MudBlazor @using MudBlazor
@using MudBlazor.Components

Loading…
Cancel
Save