Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #2189 from sbwalker/dev

Browse Source 
fix #2180 - Error in Module Creator if the template is not set
This commit is contained in:
Shaun Walker
2022-05-09 11:35:17 -04:00
committed by GitHub
parent 5618adf86c 1e84a2238b
commit ab979fd63c
2 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,6 +124,8 @@ else
if (await interop.FormValid(form)) if (await interop.FormValid(form))
{ {
try try
{
if (IsValid(_owner) && IsValid(_module) && _owner != _module && _template != "-")
{ {
var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference }; var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition); moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
@ -135,6 +137,11 @@ else
GetLocation(); GetLocation();
AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success); AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
} }
else
{
AddModuleMessage(Localizer["Message.Require.ValidName"], MessageType.Warning);
}
}
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Creating Module"); await logger.LogError(ex, "Error Creating Module");

2
Oqtane.Server/Migrations/EntityBuilders/AspNetUserLoginsEntityBuilder.cs
View File

@ -24,7 +24,7 @@ namespace Oqtane.Migrations.EntityBuilders
protected override AspNetUserLoginsEntityBuilder BuildTable(ColumnsBuilder table) protected override AspNetUserLoginsEntityBuilder BuildTable(ColumnsBuilder table)
{ {
LoginProvider = AddStringColumn(table, "LoginProvider", 128); LoginProvider = AddStringColumn(table, "LoginProvider", 128);
ProviderKey = AddStringColumn(table, "ProviderKey", 128); ProviderKey = AddStringColumn(table, "ProviderKey", 450);
ProviderDisplayName = AddMaxStringColumn(table, "ProviderDisplayName", true); ProviderDisplayName = AddMaxStringColumn(table, "ProviderDisplayName", true);
UserId = AddStringColumn(table, "UserId", 450); UserId = AddStringColumn(table, "UserId", 450);
return this; return this;