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

Merge pull request #16 from oqtane/master

Browse Source 
sync
This commit is contained in:
Shaun Walker 2020-05-01 08:08:01 -04:00 committed by GitHub
commit dda7121883
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -359,7 +359,7 @@
Page page = null; Page page = null;
try try
{ {
if (_name != string.Empty && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype))) if (_name != string.Empty)
{ {
page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId); page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId);
string currentPath = page.Path; string currentPath = page.Path;
@ -375,7 +375,7 @@
{ {
_path = _path.Substring(_path.LastIndexOf("/") + 1); _path = _path.Substring(_path.LastIndexOf("/") + 1);
} }
if (string.IsNullOrEmpty(_parentid)) if (string.IsNullOrEmpty(_parentid) || _parentid == "-1")
{ {
page.ParentId = null; page.ParentId = null;
page.Path = Utilities.GetFriendlyUrl(_path); page.Path = Utilities.GetFriendlyUrl(_path);
@ -459,7 +459,7 @@
} }
else else
{ {
AddModuleMessage("You Must Provide Page Name And Theme", MessageType.Warning); AddModuleMessage("You Must Provide Page Name", MessageType.Warning);
} }
} }
catch (Exception ex) catch (Exception ex)

4
Oqtane.Server/Infrastructure/DatabaseManager.cs
View File

@ -198,7 +198,7 @@ namespace Oqtane.Infrastructure
var upgradeConfig = DeployChanges var upgradeConfig = DeployChanges
.To .To
.SqlDatabase(NormalizeConnectionString(install.ConnectionString)) .SqlDatabase(NormalizeConnectionString(install.ConnectionString))
.WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly(), s => s.Contains("Master.")); .WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly(), s => s.Contains("Master.") && s.EndsWith(".sql",StringComparison.OrdinalIgnoreCase));
var upgrade = upgradeConfig.Build(); var upgrade = upgradeConfig.Build();
if (upgrade.IsUpgradeRequired()) if (upgrade.IsUpgradeRequired())
@ -282,7 +282,7 @@ namespace Oqtane.Infrastructure
foreach (var tenant in db.Tenant.ToList()) foreach (var tenant in db.Tenant.ToList())
{ {
var upgradeConfig = DeployChanges.To.SqlDatabase(NormalizeConnectionString(tenant.DBConnectionString)) var upgradeConfig = DeployChanges.To.SqlDatabase(NormalizeConnectionString(tenant.DBConnectionString))
.WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly(), s => s.Contains("Tenant")); .WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly(), s => s.Contains("Tenant") && s.EndsWith(".sql",StringComparison.OrdinalIgnoreCase));
var upgrade = upgradeConfig.Build(); var upgrade = upgradeConfig.Build();
if (upgrade.IsUpgradeRequired()) if (upgrade.IsUpgradeRequired())