Merge

Author: JakeGinnivan

src/FunnelWeb.Web/Application/Extensions/MarkupExtensions.cs

@@ -13,6 +13,7 @@
 using System.Web.Mvc;
 using System.Web.Mvc.Html;
 using System.Web.Routing;
+using FunnelWeb.DatabaseDeployer;
 using FunnelWeb.Model;
 using FunnelWeb.Mvc;
 using FunnelWeb.Settings;
@@ -228,7 +229,13 @@ public static IHtmlString HintFor<TModel>(this HtmlHelper<TModel> helper, Expres
 
         public static FunnelWebSettings Settings(this HtmlHelper helper)
         {
-            return DependencyResolver.Current.GetService<ISettingsProvider>().GetSettings<FunnelWebSettings>();
+            var settingsProvider = DependencyResolver.Current.GetService<ISettingsProvider>();
+
+            // A database upgrade is required, lets just use the default settings
+            if (DependencyResolver.Current.GetService<IDatabaseUpgradeDetector>().UpdateNeeded())
+                return settingsProvider.GetDefaultSettings<FunnelWebSettings>();
+
+            return settingsProvider.GetSettings<FunnelWebSettings>();
         }
 
         #endregion

src/FunnelWeb/Settings/ISettingsProvider.cs

@@ -3,6 +3,7 @@ namespace FunnelWeb.Settings
     public interface ISettingsProvider
     {
         T GetSettings<T>() where T : ISettings;
+        T GetDefaultSettings<T>() where T : ISettings;
         void SaveSettings<T>(T settings) where T : ISettings;
     }
 }

src/FunnelWeb/Settings/SettingsProvider.cs

@@ -36,6 +36,21 @@ public T GetSettings<T>() where T : ISettings
             return (T)settingsStore[settingsType];
         }
 
+        public T GetDefaultSettings<T>() where T : ISettings
+        {
+            var settings = Activator.CreateInstance<T>();
+            settingsStore.Add(typeof(T), settings);
+            var settingMetadata = ReadSettingMetadata<T>();
+
+            foreach (var setting in settingMetadata)
+            {
+                // Initialize with default values
+                setting.Write(settings, setting.DefaultValue);
+            }
+
+            return settings;
+        }
+
         private void LoadSettings<T>() where T : ISettings
         {
             var settings = Activator.CreateInstance<T>();