kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #1617 convert line break to comma when saving aliases, improve license acceptance user experience

Browse Source
This commit is contained in:
Shaun Walker 2021-08-27 08:17:48 -04:00
parent 39ccc30680
commit bb75242a4f
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Oqtane.Client/Modules/Admin/Languages/Add.razor
View File

@ -133,11 +133,12 @@ else
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title">@_productname @Localizer["License Terms"]</h5> <h5 class="modal-title">@Localizer["License Terms"]</h5>
<button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button> <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p style="height: 200px; overflow-y: scroll;"> <p style="height: 200px; overflow-y: scroll;">
<h3>@_productname</h3>
@if (!string.IsNullOrEmpty(_license)) @if (!string.IsNullOrEmpty(_license))
{ {
@((MarkupString)_license) @((MarkupString)_license)
@ -216,7 +217,7 @@ else
await logger.LogError(ex, "Error On PriceChanged"); await logger.LogError(ex, "Error On PriceChanged");
} }
} }
private async Task Search() private async Task Search()
{ {
try try
@ -297,7 +298,10 @@ else
if (package != null) if (package != null)
{ {
_productname = package.Name; _productname = package.Name;
_license = package.License.Replace("\n", "<br />"); if (!string.IsNullOrEmpty(package.License))
{
_license = package.License.Replace("\n", "<br />");
}
_packageid = package.PackageId; _packageid = package.PackageId;
_version = package.Version; _version = package.Version;
} }

10
Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
View File

@ -85,11 +85,12 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title">@_productname @Localizer["License Terms"]</h5> <h5 class="modal-title">@Localizer["License Terms"]</h5>
<button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button> <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p style="height: 200px; overflow-y: scroll;"> <p style="height: 200px; overflow-y: scroll;">
<h3>@_productname</h3>
@if (!string.IsNullOrEmpty(_license)) @if (!string.IsNullOrEmpty(_license))
{ {
@((MarkupString)_license) @((MarkupString)_license)
@ -168,7 +169,7 @@
await logger.LogError(ex, "Error On PriceChanged"); await logger.LogError(ex, "Error On PriceChanged");
} }
} }
private async Task Search() private async Task Search()
{ {
try try
@ -209,7 +210,10 @@
if (package != null) if (package != null)
{ {
_productname = package.Name; _productname = package.Name;
_license = package.License.Replace("\n", "<br />"); if (!string.IsNullOrEmpty(package.License))
{
_license = package.License.Replace("\n", "<br />");
}
_packageid = package.PackageId; _packageid = package.PackageId;
_version = package.Version; _version = package.Version;
} }

1
Oqtane.Client/Modules/Admin/Site/Index.razor
View File

@ -391,6 +391,7 @@
var unique = true; var unique = true;
if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{ {
_urls = _urls.Replace("\n", ",");
foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
{ {
if (_aliasList.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId)) if (_aliasList.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId))

10
Oqtane.Client/Modules/Admin/Themes/Add.razor
View File

@ -86,11 +86,12 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title">@_productname @Localizer["License Terms"]</h5> <h5 class="modal-title">@Localizer["License Terms"]</h5>
<button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button> <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p style="height: 200px; overflow-y: scroll;"> <p style="height: 200px; overflow-y: scroll;">
<h3>@_productname</h3>
@if (!string.IsNullOrEmpty(_license)) @if (!string.IsNullOrEmpty(_license))
{ {
@((MarkupString)_license) @((MarkupString)_license)
@ -169,7 +170,7 @@
await logger.LogError(ex, "Error On PriceChanged"); await logger.LogError(ex, "Error On PriceChanged");
} }
} }
private async Task Search() private async Task Search()
{ {
try try
@ -210,7 +211,10 @@
if (package != null) if (package != null)
{ {
_productname = package.Name; _productname = package.Name;
_license = package.License.Replace("\n", "<br />"); if (!string.IsNullOrEmpty(package.License))
{
_license = package.License.Replace("\n", "<br />");
}
_packageid = package.PackageId; _packageid = package.PackageId;
_version = package.Version; _version = package.Version;
} }