imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8605 from abpframework/auto-merge/rel-4-3/291

Browse Source 
Merge branch dev with rel-4.3
pull/8615/head
Halil İbrahim Kalkan 5 years ago committed by GitHub
parent ce6dd82bf2 8a31807f36
commit 3bc1536fdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File

4
framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
Unescape View File

@ -349,6 +349,10 @@ namespace Volo.Abp.EntityFrameworkCore
{
entryProperty.CurrentValue = TypeDescriptor.GetConverter(conversionType).ConvertFromInvariantString(entityProperty.ToString());
}
else if (conversionType.IsEnum)
{
entryProperty.CurrentValue = Enum.ToObject(conversionType, entityProperty);
}
else
{
entryProperty.CurrentValue = Convert.ChangeType(entityProperty, conversionType, CultureInfo.InvariantCulture);

2
modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml
Unescape View File

@ -64,7 +64,7 @@
}
</abp-column>
</abp-row>
<abp-card>
<abp-card class="mb-2">
<abp-card-body class="p-5">
<abp-blockquote class="text-center">
<p class="h2 mb-4">

17
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
Unescape View File

@ -5,14 +5,8 @@
@model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating.RatingViewModel
@inject IHtmlLocalizer<CmsKitResource> L
<div class="p-3 my-3 card">
<div class="row form-row">
<div class="col-auto text-left">
<span class="area-title">
@L["Rating"]
</span>
</div>
<div class="col text-right">
<div class="row form-row">
<div class="col">
<div class="cms-rating-area" data-entity-type="@Model.EntityType" data-entity-id="@Model.EntityId" id="cms-rating_{@Model.EntityType}_{@Model.EntityId}">
@if (CurrentUser.IsAuthenticated)
{
@ -58,15 +52,14 @@
<small class="live-rating text-center d-inline-block" style="width: 24px">@(Model.CurrentRating != null ? Model.CurrentRating + " " : 0 + "")</small>
<span class="my-rating btn btn-secondary btn-sm py-1 ml-2" data-rating="@(Model.CurrentRating ?? 0)" data-authenticated="@(Model.CurrentRating != null)">
<span class="my-rating text-dark p-1" data-rating="@(Model.CurrentRating ?? 0)" data-authenticated="@(Model.CurrentRating != null)">
</span>
}
else
{
<span class="my-rating btn btn-secondary btn-sm py-1 ml-2" data-authenticated="True" data-toggle="popover" data-placement="right" data-html="true" data-content="<div class='text-center'><a href='@Model.LoginUrl' class='btn btn-primary btn-block'>@L["LoginToRate"]</a></div>"></span>
<span class="my-rating text-dark p-1" data-authenticated="True" data-toggle="popover" data-placement="right" data-html="true" data-content="<div class='text-center'><a href='@Model.LoginUrl' class='btn btn-primary btn-block'>@L["LoginToRate"]</a></div>"></span>
<span class="rating-login"></span>
}
</div>
</div>
</div>
</div>
</div>

17
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml
Unescape View File

@ -6,14 +6,8 @@
@model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection.ReactionSelectionViewComponent.ReactionSelectionViewModel
<div class="p-3 my-3 card">
<div class="row form-row">
<div class="col-auto text-left">
<span class="area-title">
@L["Reactions"]
</span>
</div>
<div class="col text-right">
<div class="row form-row">
<div class="col">
<span class="cms-reaction-area" data-entity-type="@Model.EntityType" data-entity-id="@Model.EntityId">
@foreach (var reaction in Model.Reactions.Where(r => r.Count > 0))
@ -25,7 +19,7 @@
}
@if (CurrentUser.IsAuthenticated)
{
<a class="cms-reaction-select-icon btn btn-secondary text-light btn-sm py-1 ml-2" href="javascript:;">
<a class="cms-reaction-select-icon text-dark p-1" href="javascript:;">
<i class="fa fa-smile-o"></i>
</a>
<div class="cms-reaction-selection-popover-content" style="display: none">
@ -39,11 +33,10 @@
}
else
{
<span class="ms-reaction-select-icon btn btn-secondary text-light btn-sm py-1 ml-2" data-authenticated="True" data-toggle="popover" data-placement="right" data-html="true" data-content="<div class='text-center'><a href='@Model.LoginUrl' class='btn btn-primary btn-block'>@L["LoginToReact"]</a></div>">
<span class="ms-reaction-select-icon text-dark p-1" data-authenticated="True" data-toggle="popover" data-placement="right" data-html="true" data-content="<div class='text-center'><a href='@Model.LoginUrl' class='btn btn-primary btn-block'>@L["LoginToReact"]</a></div>">
<i class="fa fa-smile-o"></i>
</span>
}
</span>
</div>
</div>
</div>
</div>
Write Preview
Loading…
Cancel
Save