Skip to content

Fix backward incompatible changes (#4001) #4002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msynk merged 3 commits into from
Feb 23, 2023
Merged

Fix backward incompatible changes (#4001) #4002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51c46e8
fix backward incompatible changes #4001
msynk Feb 23, 2023
49631cc
fix incorrect formatting
msynk Feb 23, 2023
f8830a1
remove redundant spaces
msynk Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Shared/Pages/EditProfilePage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,13 @@
</div>

<div class="form-choice-container">
<BitRadioButtonGroup Label="@Localizer[nameof(AppStrings.Gender)]" @bind-Value="_userToEdit.GenderAsString">
<BitRadioButtonOption Value="@Gender.Male.ToString()" Text="@Localizer[nameof(AppStrings.GenderMale)]" AriaLabel="@Localizer[nameof(AppStrings.GenderMale)]" />
<BitRadioButtonOption Value="@Gender.Female.ToString()" Text="@Localizer[nameof(AppStrings.GenderFemale)]" AriaLabel="@Localizer[nameof(AppStrings.GenderFemale)]" />
<BitRadioButtonOption Value="@Gender.Custom.ToString()" Text="@Localizer[nameof(AppStrings.GenderCustom)]" AriaLabel="@Localizer[nameof(AppStrings.GenderCustom)]" />
</BitRadioButtonGroup>
<BitChoiceGroup TItem="BitChoiceGroupOption<string?>" TValue="string"
Label="@Localizer[nameof(AppStrings.Gender)]"
@bind-Value="_userToEdit.GenderAsString">
<BitChoiceGroupOption Value="@Gender.Male.ToString()" Text="@Localizer[nameof(AppStrings.GenderMale)]" AriaLabel="@Localizer[nameof(AppStrings.GenderMale)]" />
<BitChoiceGroupOption Value="@Gender.Female.ToString()" Text="@Localizer[nameof(AppStrings.GenderFemale)]" AriaLabel="@Localizer[nameof(AppStrings.GenderFemale)]" />
<BitChoiceGroupOption Value="@Gender.Custom.ToString()" Text="@Localizer[nameof(AppStrings.GenderCustom)]" AriaLabel="@Localizer[nameof(AppStrings.GenderCustom)]" />
</BitChoiceGroup>
<ValidationMessage For="@(() => _userToEdit.Gender)" />
</div>

Expand Down
16 changes: 9 additions & 7 deletions src/Templates/BlazorDual/Bit.BlazorDual/src/BlazorDual.Web/Pages/EditProfilePage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,27 @@

<div class="form-input-container">
<BitTextField Label="@Localizer[nameof(AppStrings.FullName)]"
@bind-Value="_userToEdit.FullName"
@bind-Value="_userToEdit.FullName"
Placeholder="@Localizer[nameof(AppStrings.FullName)]" />
<ValidationMessage For="@(() => _userToEdit.FullName)" />
</div>

<div class="form-input-container">
<BitDatePicker Label="@Localizer[nameof(AppStrings.BirthDate)]"
Class="edit-profile-dtp"
@bind-Value="_userToEdit.BirthDate"
@bind-Value="_userToEdit.BirthDate"
Placeholder="@Localizer[nameof(AppStrings.SelectBirthDate)]" GoToToday="@Localizer[nameof(AppStrings.GoToToday)]" />
<ValidationMessage For="@(() => _userToEdit.BirthDate)" />
</div>

<div class="form-choice-container">
<BitRadioButtonGroup Label="@Localizer[nameof(AppStrings.Gender)]" @bind-Value="_userToEdit.GenderAsString">
<BitRadioButtonOption Value="@Gender.Male.ToString()" Text="@Localizer[nameof(AppStrings.GenderMale)]" AriaLabel="@Localizer[nameof(AppStrings.GenderMale)]"></BitRadioButtonOption>
<BitRadioButtonOption Value="@Gender.Female.ToString()" Text="Famale" AriaLabel="@Localizer[nameof(AppStrings.GenderFemale)]"></BitRadioButtonOption>
<BitRadioButtonOption Value="@Gender.Custom.ToString()" Text="Custom" AriaLabel="@Localizer[nameof(AppStrings.GenderCustom)]"></BitRadioButtonOption>
</BitRadioButtonGroup>
<BitChoiceGroup TItem="BitChoiceGroupOption<string?>" TValue="string"
Label="@Localizer[nameof(AppStrings.Gender)]"
@bind-Value="_userToEdit.GenderAsString">
<BitChoiceGroupOption Value="@Gender.Male.ToString()" Text="@Localizer[nameof(AppStrings.GenderMale)]" AriaLabel="@Localizer[nameof(AppStrings.GenderMale)]" />
<BitChoiceGroupOption Value="@Gender.Female.ToString()" Text="@Localizer[nameof(AppStrings.GenderFemale)]" AriaLabel="@Localizer[nameof(AppStrings.GenderFemale)]" />
<BitChoiceGroupOption Value="@Gender.Custom.ToString()" Text="@Localizer[nameof(AppStrings.GenderCustom)]" AriaLabel="@Localizer[nameof(AppStrings.GenderCustom)]" />
</BitChoiceGroup>
<ValidationMessage For="@(() => _userToEdit.Gender)" />
</div>

Expand Down
13 changes: 7 additions & 6 deletions src/Templates/TodoTemplate/Bit.TodoTemplate/src/Client/Shared/Pages/EditProfilePage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,13 @@
</div>

<div class="form-choice-container">
<BitRadioButtonGroup Label="@Localizer[nameof(AppStrings.Gender)]" @bind-Value="_userToEdit.GenderAsString">
<BitRadioButtonOption Value="@Gender.Male.ToString()" Text="@Localizer[nameof(AppStrings.GenderMale)]" AriaLabel="@Localizer[nameof(AppStrings.GenderMale)]"></BitRadioButtonOption>
<BitRadioButtonOption Value="@Gender.Female.ToString()" Text="Famale" AriaLabel="@Localizer[nameof(AppStrings.GenderFemale)]"></BitRadioButtonOption>
<BitRadioButtonOption Value="@Gender.Custom.ToString()" Text="Custom" AriaLabel="@Localizer[nameof(AppStrings.GenderCustom)]"></BitRadioButtonOption>
</BitRadioButtonGroup>
<ValidationMessage For="@(() => _userToEdit.Gender)" />
<BitChoiceGroup TItem="BitChoiceGroupOption<string?>" TValue="string"
Label="@Localizer[nameof(AppStrings.Gender)]"
@bind-Value="_userToEdit.GenderAsString">
<BitChoiceGroupOption Value="@Gender.Male.ToString()" Text="@Localizer[nameof(AppStrings.GenderMale)]" AriaLabel="@Localizer[nameof(AppStrings.GenderMale)]" />
<BitChoiceGroupOption Value="@Gender.Female.ToString()" Text="@Localizer[nameof(AppStrings.GenderFemale)]" AriaLabel="@Localizer[nameof(AppStrings.GenderFemale)]" />
<BitChoiceGroupOption Value="@Gender.Custom.ToString()" Text="@Localizer[nameof(AppStrings.GenderCustom)]" AriaLabel="@Localizer[nameof(AppStrings.GenderCustom)]" />
</BitChoiceGroup>
</div>

<BitLoadingButton IsLoading="_isSaving"
Expand Down