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

Merge pull request #17 from oqtane/master

Browse Source 
sync with upstream
This commit is contained in:
Shaun Walker 2020-02-11 15:00:35 -05:00 committed by GitHub
commit 715325e66f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Sites/Edit.razor
View File

@ -304,7 +304,7 @@
SettingService.SetSetting(settings, "SMTPSSL", smtpssl); SettingService.SetSetting(settings, "SMTPSSL", smtpssl);
SettingService.SetSetting(settings, "SMTPUsername", smtpusername); SettingService.SetSetting(settings, "SMTPUsername", smtpusername);
SettingService.SetSetting(settings, "SMTPPassword", smtppassword); SettingService.SetSetting(settings, "SMTPPassword", smtppassword);
await SettingService.UpdateModuleSettingsAsync(settings, site.SiteId); await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
await logger.LogInformation("Site Saved {Site}", site); await logger.LogInformation("Site Saved {Site}", site);

20
Oqtane.Client/Shared/ModuleInstance.razor
View File

@ -39,17 +39,23 @@
if (typename != null) if (typename != null)
{ {
moduleType = Type.GetType(typename); moduleType = Type.GetType(typename);
}
if (moduleType != null) if (moduleType != null)
{ {
builder.OpenComponent(0, moduleType); builder.OpenComponent(0, moduleType);
builder.CloseComponent(); builder.CloseComponent();
}
else
{
// module does not exist with typename specified
message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor";
}
} }
else else
{ {
// module does not exist with typename specified message = "Something is wrong with moduletype";
message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor";
} }
}; };
} }

2
Oqtane.Client/Shared/SiteRouter.razor
View File

@ -408,7 +408,7 @@
if (module.PageId == pageid) if (module.PageId == pageid)
{ {
// ensure module's pane exists in current page and if not, assign it to the Admin pane // ensure module's pane exists in current page and if not, assign it to the Admin pane
if (!panes.ToLower().Contains(module.Pane.ToLower())) if (panes == null || !panes.ToLower().Contains(module.Pane.ToLower()))
{ {
module.Pane = Constants.AdminPane; module.Pane = Constants.AdminPane;
} }

2
Oqtane.Upgrade/Oqtane.Upgrade.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">