clean message when module control does not support mvc pipeline

Author: sachatrauwaen

DNN Platform/DotNetNuke.Web.MvcPipeline/Containers/SkinHelpers.Content.cs

@@ -57,7 +57,17 @@ public static IHtmlString Content(this HtmlHelper<ContainerModel> htmlHelper)
             var moduleDiv = new TagBuilder("div");
             moduleDiv.AddCssClass(model.ModuleHost.CssClass);
             // render module control
-            moduleDiv.InnerHtml += htmlHelper.Control(model.ModuleConfiguration);
+            try
+            {
+                moduleDiv.InnerHtml += htmlHelper.Control(model.ModuleConfiguration);
+            }
+            catch (Exception ex)
+            {
+                if (model.EditMode)
+                {
+                    moduleDiv.InnerHtml += "<div class=\"dnnFormMessage dnnFormError\"> Error loading module: " + ex.Message + "</div>";
+                }
+            }
             moduleContentPaneDiv.InnerHtml += moduleDiv.ToString();
             if (!string.IsNullOrEmpty(model.Footer))
             {

DNN Platform/DotNetNuke.Web.MvcPipeline/Utils/MvcUtils.cs

@@ -105,7 +105,7 @@ public static IMvcModuleControl GetModuleControl(ModuleInfo module, string contr
                 }
                 else
                 {
-                    throw new Exception("The module control dous not support MVC pipeline : " + module.ModuleTitle + " / " + module.ModuleControl.ControlTitle);
+                    throw new Exception("The module control dous not support the MVC pipeline : " + module.ModuleTitle + " " + module.ModuleControl.ControlTitle);
                 }
             }
             control.ModuleContext.Configuration = module;

DNN Platform/DotNetNuke.Web.MvcWebsite/Controls/ModuleActionsControl.cs

@@ -16,8 +16,10 @@ namespace DotNetNuke.Web.MvcWebsite.Controls
     using DotNetNuke.Entities.Tabs;
     using DotNetNuke.Framework;
     using DotNetNuke.Framework.JavaScriptLibraries;
+    using DotNetNuke.Instrumentation;
     using DotNetNuke.Security;
     using DotNetNuke.Security.Permissions;
+    using DotNetNuke.Services.Installer.Log;
     using DotNetNuke.Services.Localization;
     using DotNetNuke.Services.Personalization;
 
@@ -30,6 +32,7 @@ namespace DotNetNuke.Web.MvcWebsite.Controls
 
     public class ModuleActionsControl : RazorModuleControlBase, IResourcable
     {
+        private ILog Logger = LoggerSource.Instance.GetLogger(typeof(ModuleActionsControl));
         private readonly List<int> validIDs = new List<int>();
         private ModuleAction actionRoot;
 
@@ -192,13 +195,19 @@ protected void OnLoad(ModuleInfo moduleInfo)
             // base.OnLoad(e);
 
             var moduleActions = new ModuleActionCollection();
+            try
+            {
+                var moduleControl = MvcUtils.CreateModuleControl(moduleInfo);
 
-            var moduleControl = MvcUtils.CreateModuleControl(moduleInfo);
-
-            var actionable = moduleControl as IActionable;
-            if (actionable != null)
+                var actionable = moduleControl as IActionable;
+                if (actionable != null)
+                {
+                    moduleActions = actionable.ModuleActions;
+                }
+            }
+            catch (Exception ex)
             {
-                moduleActions = actionable.ModuleActions;
+                Logger.Error("Error loading module actions for module " + moduleInfo.ModuleID, ex);
             }
 
             this.ActionRoot.Actions.AddRange(this.Actions);