- Version:
+ Version:
();
- result = db.Database.CanConnect();
- if (result)
+ if (db.Database.CanConnect())
{
try
{
- result = db.Tenant.Any();
+ var provisioned = db.Tenant.Any();
}
catch
{
- result = false;
+ result.Message = "Master Database Not Installed Correctly";
}
}
+ else
+ {
+ result.Message = "Cannot Connect To Master Database";
+ }
}
}
return result;
@@ -74,7 +77,8 @@ namespace Oqtane.Infrastructure
// startup or silent installation
install = new InstallConfig { ConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey), TenantName = TenantNames.Master, IsNewTenant = false };
- if (!IsInstalled())
+ var installation = IsInstalled();
+ if (!installation.Success)
{
install.Aliases = GetInstallationConfig(SettingKeys.DefaultAliasKey, string.Empty);
install.HostPassword = GetInstallationConfig(SettingKeys.HostPasswordKey, string.Empty);
@@ -97,6 +101,14 @@ namespace Oqtane.Infrastructure
install.ConnectionString = "";
}
}
+ else
+ {
+ if (!string.IsNullOrEmpty(installation.Message))
+ {
+ // problem with prior installation
+ install.ConnectionString = "";
+ }
+ }
}
else
{
diff --git a/Oqtane.Server/Infrastructure/Interfaces/IDatabaseManager.cs b/Oqtane.Server/Infrastructure/Interfaces/IDatabaseManager.cs
index ffb0ff9c..6257db16 100644
--- a/Oqtane.Server/Infrastructure/Interfaces/IDatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/Interfaces/IDatabaseManager.cs
@@ -1,11 +1,11 @@
-using Oqtane.Models;
+using Oqtane.Models;
using Oqtane.Shared;
namespace Oqtane.Infrastructure
{
public interface IDatabaseManager
{
- bool IsInstalled();
+ Installation IsInstalled();
Installation Install();
Installation Install(InstallConfig install);
}
diff --git a/Oqtane.Server/Infrastructure/SyncManager.cs b/Oqtane.Server/Infrastructure/SyncManager.cs
index f41c01b0..d70cc456 100644
--- a/Oqtane.Server/Infrastructure/SyncManager.cs
+++ b/Oqtane.Server/Infrastructure/SyncManager.cs
@@ -1,4 +1,4 @@
-using Oqtane.Models;
+using Oqtane.Models;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -17,7 +17,7 @@ namespace Oqtane.Infrastructure
public List GetSyncEvents(int tenantId, DateTime lastSyncDate)
{
- return SyncEvents.Where(item => item.TenantId == tenantId && item.ModifiedOn >= lastSyncDate).ToList();
+ return SyncEvents.Where(item => (item.TenantId == tenantId || item.TenantId == -1) && item.ModifiedOn >= lastSyncDate).ToList();
}
public void AddSyncEvent(int tenantId, string entityName, int entityId)
diff --git a/Oqtane.Server/Infrastructure/UpgradeManager.cs b/Oqtane.Server/Infrastructure/UpgradeManager.cs
index cbfcc63b..b2385b2b 100644
--- a/Oqtane.Server/Infrastructure/UpgradeManager.cs
+++ b/Oqtane.Server/Infrastructure/UpgradeManager.cs
@@ -25,14 +25,12 @@ namespace Oqtane.Infrastructure
public void Upgrade(Tenant tenant, string version)
{
- // core framework upgrade logic - note that you can check if current tenant is Master if you only want to execute logic once
- var pageTemplates = new List();
-
+ // core framework upgrade logic - note that you can check if current tenant is Master if you only want to execute the logic once
switch (version)
{
case "0.9.0":
- // add a page to all existing sites on upgrade
-
+ // this code is commented out on purpose - it provides an example of how to programmatically add a page to all existing sites on upgrade
+ var pageTemplates = new List();
//pageTemplates.Add(new PageTemplate
//{
// Name = "Test",
@@ -68,7 +66,12 @@ namespace Oqtane.Infrastructure
case "2.0.2":
if (tenant.Name == TenantNames.Master)
{
- Directory.Delete(Utilities.PathCombine(_environment.WebRootPath, "Modules", "Templates", "Internal", Path.DirectorySeparatorChar.ToString()), true);
+ // remove Internal module template files as they are no longer supported
+ var internalTemplatePath = Utilities.PathCombine(_environment.WebRootPath, "Modules", "Templates", "Internal", Path.DirectorySeparatorChar.ToString());
+ if (Directory.Exists(internalTemplatePath))
+ {
+ Directory.Delete(internalTemplatePath, true);
+ }
}
break;
}
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index e1cc6c21..1678969c 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -37,7 +37,9 @@
@if (Model.Message != "")
{
- @Model.Message
+
+ @Model.Message
+
}
diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs
index ba2a7d89..1e744c01 100644
--- a/Oqtane.Server/Startup.cs
+++ b/Oqtane.Server/Startup.cs
@@ -226,7 +226,7 @@ namespace Oqtane
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
- public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ISyncManager sync)
{
ServiceActivator.Configure(app.ApplicationServices);
@@ -264,6 +264,9 @@ namespace Oqtane
endpoints.MapControllers();
endpoints.MapFallbackToPage("/_Host");
});
+
+ // create a sync event to identify server application startup
+ sync.AddSyncEvent(-1, "Application", -1);
}
}
}
diff --git a/Oqtane.Server/wwwroot/css/app.css b/Oqtane.Server/wwwroot/css/app.css
index ce87887d..eebf63a6 100644
--- a/Oqtane.Server/wwwroot/css/app.css
+++ b/Oqtane.Server/wwwroot/css/app.css
@@ -1,4 +1,4 @@
-@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');
+@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');
html, body {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
@@ -125,6 +125,13 @@ app {
vertical-align: inherit;
}
+.app-alert {
+ padding: 20px;
+ background-color: #f44336; /* red */
+ color: white;
+ margin-bottom: 15px;
+}
+
/* Tooltips */
.app-tooltip {
cursor: help;