Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #940 from sbwalker/dev

Browse Source 
fix ModuleCreator Invalid character use in naming fields #889
This commit is contained in:
Shaun Walker 2020-11-20 16:40:58 -05:00 committed by GitHub
commit 03d246340f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 72 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
View File

@ -5,6 +5,7 @@
@inject IModuleService ModuleService @inject IModuleService ModuleService
@inject ISystemService SystemService @inject ISystemService SystemService
@inject IStringLocalizer<Index> Localizer @inject IStringLocalizer<Index> Localizer
@using System.Text.RegularExpressions
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
@ -94,18 +95,18 @@
{ {
try try
{ {
if (!string.IsNullOrEmpty(_owner) && !string.IsNullOrEmpty(_module) && _template != "-") if (IsValid(_owner) && IsValid(_module) && _template != "-")
{ {
ShowProgressIndicator(); ShowProgressIndicator();
var interop = new Interop(JSRuntime); var interop = new Interop(JSRuntime);
await interop.RedirectBrowser(NavigateUrl(), 5); await interop.RedirectBrowser(NavigateUrl(), 5);
var moduleDefinition = new ModuleDefinition { Owner = _owner.Replace(" ", ""), Name = _module.Replace(" ", ""), Description = _description, Template = _template, Version = _reference }; var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition, ModuleState.ModuleId); await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition, ModuleState.ModuleId);
} }
else else
{ {
AddModuleMessage("You Must Provide An Owner, Module Name, And Template", MessageType.Warning); AddModuleMessage("You Must Provide A Valid Owner Name, Module Name, And Template", MessageType.Warning);
} }
} }
catch (Exception ex) catch (Exception ex)
@ -114,6 +115,12 @@
} }
} }
private bool IsValid(string name)
{
// must contain letters, underscores and digits and first character must be letter or underscore
return !string.IsNullOrEmpty(name) && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
}
private async void TemplateChanged(ChangeEventArgs e) private async void TemplateChanged(ChangeEventArgs e)
{ {
try try