From b8c609ddc9a0cbac90377d0e6938fe7b938d1ec0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 14 Mar 2019 11:41:29 +1100
Subject: [PATCH] removes old notes, makes MediaSaveModelValidator to be
 consistent

---
 .../views/content/overlays/publish.controller.js |  6 ------
 .../src/views/content/overlays/publish.html      |  2 --
 .../Editors/Filters/ContentModelValidator.cs     |  8 ++++----
 .../Editors/Filters/ContentSaveModelValidator.cs |  2 +-
 .../Filters/MediaItemSaveValidationAttribute.cs  |  2 +-
 .../Editors/Filters/MediaSaveModelValidator.cs   | 16 ++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj               |  1 +
 7 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 src/Umbraco.Web/Editors/Filters/MediaSaveModelValidator.cs

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
index 961adc6f97..bd3a18e7d4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
@@ -73,12 +73,6 @@
 
         function hasAnyData(variant) {
 
-            //** DO NOT MERGE THIS!!!!!! THIS IS FOR TESTING *****
-            //if(variant.name == null || variant.name.length === 0) {
-            //    return false;
-            //}
-
-
             var result = variant.isDirty != null;
 
             if(result) return true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
index 4a169dd136..940d93b8a6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
@@ -10,8 +10,6 @@
 
     <div class="umb-list umb-list--condensed" ng-if="!vm.loading">
 
-        <!--Why are we doing the filter on notification type?-->
-
         <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.dirtyVariantFilter track by variant.compositeId">
             <ng-form name="publishVariantSelectorForm">
                 <div class="flex">
diff --git a/src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs b/src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs
index f66439094c..4acf0c948e 100644
--- a/src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs
+++ b/src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs
@@ -16,12 +16,12 @@ namespace Umbraco.Web.Editors.Filters
     /// <summary>
     /// A base class purely used for logging without generics
     /// </summary>
-    internal class ContentModelValidator
+    internal abstract class ContentModelValidator
     {
         protected IUmbracoContextAccessor UmbracoContextAccessor { get; }
         protected ILogger Logger { get; }
 
-        public ContentModelValidator(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor)
+        protected ContentModelValidator(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor)
         {
             Logger = logger ?? throw new ArgumentNullException(nameof(logger));
             UmbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
@@ -38,12 +38,12 @@ namespace Umbraco.Web.Editors.Filters
     /// If any severe errors occur then the response gets set to an error and execution will not continue. Property validation
     /// errors will just be added to the ModelState.
     /// </remarks>
-    internal class ContentModelValidator<TPersisted, TModelSave, TModelWithProperties>: ContentModelValidator
+    internal abstract class ContentModelValidator<TPersisted, TModelSave, TModelWithProperties>: ContentModelValidator
         where TPersisted : class, IContentBase
         where TModelSave: IContentSave<TPersisted>
         where TModelWithProperties : IContentProperties<ContentPropertyBasic>
     {
-        public ContentModelValidator(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor) : base(logger, umbracoContextAccessor)
+        protected ContentModelValidator(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor) : base(logger, umbracoContextAccessor)
         {
         }
         
diff --git a/src/Umbraco.Web/Editors/Filters/ContentSaveModelValidator.cs b/src/Umbraco.Web/Editors/Filters/ContentSaveModelValidator.cs
index d384e7ce04..b74cd71f11 100644
--- a/src/Umbraco.Web/Editors/Filters/ContentSaveModelValidator.cs
+++ b/src/Umbraco.Web/Editors/Filters/ContentSaveModelValidator.cs
@@ -8,7 +8,7 @@ using Umbraco.Web.Models.ContentEditing;
 namespace Umbraco.Web.Editors.Filters
 {
     /// <summary>
-    /// Validation helper for <see cref="ContentItemSave"/>
+    /// Validator for <see cref="ContentItemSave"/>
     /// </summary>
     internal class ContentSaveModelValidator : ContentModelValidator<IContent, ContentItemSave, ContentVariantSave>
     {
diff --git a/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs b/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
index 14bf4890e6..7351c476e4 100644
--- a/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
+++ b/src/Umbraco.Web/Editors/Filters/MediaItemSaveValidationAttribute.cs
@@ -39,7 +39,7 @@ namespace Umbraco.Web.Editors.Filters
         public override void OnActionExecuting(HttpActionContext actionContext)
         {
             var model = (MediaItemSave)actionContext.ActionArguments["contentItem"];
-            var contentItemValidator = new ContentModelValidator<IMedia, MediaItemSave, IContentProperties<ContentPropertyBasic>>(_logger, _umbracoContextAccessor);
+            var contentItemValidator = new MediaSaveModelValidator(_logger, _umbracoContextAccessor);
 
             if (ValidateUserAccess(model, actionContext))
             {
diff --git a/src/Umbraco.Web/Editors/Filters/MediaSaveModelValidator.cs b/src/Umbraco.Web/Editors/Filters/MediaSaveModelValidator.cs
new file mode 100644
index 0000000000..83c0885d62
--- /dev/null
+++ b/src/Umbraco.Web/Editors/Filters/MediaSaveModelValidator.cs
@@ -0,0 +1,16 @@
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.Web.Editors.Filters
+{
+    /// <summary>
+    /// Validator for <see cref="MediaItemSave"/>
+    /// </summary>
+    internal class MediaSaveModelValidator : ContentModelValidator<IMedia, MediaItemSave, IContentProperties<ContentPropertyBasic>>
+    {
+        public MediaSaveModelValidator(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor) : base(logger, umbracoContextAccessor)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 295dcb3ef7..7cc9b3039b 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -135,6 +135,7 @@
     <Compile Include="Dashboards\SettingsDashboards.cs" />
     <Compile Include="Editors\BackOfficePreviewModel.cs" />
     <Compile Include="Editors\Filters\ContentSaveModelValidator.cs" />
+    <Compile Include="Editors\Filters\MediaSaveModelValidator.cs" />
     <Compile Include="Editors\PackageController.cs" />
     <Compile Include="Editors\KeepAliveController.cs" />
     <Compile Include="Editors\MacrosController.cs" />