DevTools should generate an exception when calling installation page

mgesing · mgesing · commit 62dd2ef939e7 · 2016-05-12T11:29:25.000+02:00
diff --git a/src/Plugins/SmartStore.DevTools/DependencyRegistrar.cs b/src/Plugins/SmartStore.DevTools/DependencyRegistrar.cs
@@ -1,12 +1,5 @@
-using System;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Web.Mvc;
-using System.Reflection;
 using Autofac;
-using Autofac.Core;
 using Autofac.Integration.Mvc;
-using SmartStore.Core.Plugins;
 using SmartStore.Core.Data;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Infrastructure.DependencyManagement;
@@ -16,13 +9,13 @@
 
 namespace SmartStore.DevTools
 {
-    public class DependencyRegistrar : IDependencyRegistrar
+	public class DependencyRegistrar : IDependencyRegistrar
     {
 		public virtual void Register(ContainerBuilder builder, ITypeFinder typeFinder, bool isActiveModule)
         {
 			builder.RegisterType<ProfilerService>().As<IProfilerService>().InstancePerRequest();
 
-			if (isActiveModule)
+			if (isActiveModule && DataSettings.DatabaseIsInstalled())
 			{
 				// intercept ALL public store controller actions
 				builder.RegisterType<ProfilerFilter>().AsActionFilterFor<SmartController>();
diff --git a/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs b/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Web;
+using SmartStore.Core.Data;
 using SmartStore.Core.Infrastructure;
 using StackExchange.Profiling;
 
@@ -43,6 +44,11 @@ private static bool ShouldProfile(HttpApplication app)
 			if (app.Context == null || app.Context.Request == null)
 				return false;
 
+			if (!DataSettings.DatabaseIsInstalled())
+			{
+				return false;
+			}
+
 			var url = app.Context.Request.AppRelativeCurrentExecutionFilePath;
 			if (url.StartsWith("~/admin", StringComparison.InvariantCultureIgnoreCase) || url.StartsWith("~/mini-profiler", StringComparison.InvariantCultureIgnoreCase) || url.StartsWith("~/bundles", StringComparison.InvariantCultureIgnoreCase))
 			{
