From 93bb75511bd61351df100ccbdcc10e930a048ba6 Mon Sep 17 00:00:00 2001
From: Matt Brailsford <me@mattbrailsford.com>
Date: Thu, 18 Jul 2019 13:09:12 +0100
Subject: [PATCH 1/2] Fixed #5907 by reloading content on bulk publish /
 unpublish

Fixes #5907
---
 .../listview/listview.controller.js                | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index df7a574c49..9b4c01f4f9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -405,7 +405,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
     };
 
    $scope.publish = function () {
-        applySelected(
+       var attempt = applySelected(
                 function (selected, index) { return contentResource.publishById(getIdCallback(selected[index])); },
                 function (count, total) {
                     var key = (total === 1 ? "bulk_publishedItemOfItem" : "bulk_publishedItemOfItems");
@@ -415,10 +415,15 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
                     var key = (total === 1 ? "bulk_publishedItem" : "bulk_publishedItems");
                     return localizationService.localize(key, [total]);
                 });
+        if (attempt) {
+            attempt.then(function () {
+                $scope.getContent();
+            });
+        }
    };
 
     $scope.unpublish = function() {
-        applySelected(
+        var attempt = applySelected(
             function(selected, index) { return contentResource.unPublish(getIdCallback(selected[index])); },
             function(count, total) {
                 var key = (total === 1 ? "bulk_unpublishedItemOfItem" : "bulk_unpublishedItemOfItems");
@@ -428,6 +433,11 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
                 var key = (total === 1 ? "bulk_unpublishedItem" : "bulk_unpublishedItems");
                 return localizationService.localize(key, [total]);
             });
+        if (attempt) {
+            attempt.then(function () {
+                $scope.getContent();
+            });
+        }
     };
 
     $scope.move = function() {

From e9eecb2031bc50f58d1d971ae58f2b12aad38ff8 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 6 Jul 2019 08:32:04 +0200
Subject: [PATCH 2/2] Ensure correct icon for file types in search results

---
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 9cfa29985b..543499d054 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -301,19 +301,7 @@ namespace Umbraco.Web.Search
         /// <param name="results"></param>
         /// <returns></returns>
         private IEnumerable<SearchResultItem> MediaFromSearchResults(IEnumerable<SearchResult> results)
-        {
-            var mapped = Mapper.Map<IEnumerable<SearchResultItem>>(results).ToArray();
-            //add additional data
-            foreach (var m in mapped)
-            {
-                //if no icon could be mapped, it will be set to document, so change it to picture
-                if (m.Icon == "icon-document")
-                {
-                    m.Icon = "icon-picture";
-                }
-            }
-            return mapped;
-        }
+            => Mapper.Map<IEnumerable<SearchResultItem>>(results).ToArray();
 
         /// <summary>
         /// Returns a collection of entities for content based on search results