Bump version to 8.0.2

(cherry picked from commit 173df80e3d)

# Conflicts:
#	src/Umbraco.Core/Services/Implement/MediaService.cs

src/SolutionInfo.cs

@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.0.1")]
+[assembly: AssemblyFileVersion("8.0.2")]
-[assembly: AssemblyInformationalVersion("8.0.1")]
+[assembly: AssemblyInformationalVersion("8.0.2")]

src/Umbraco.Core/PropertyEditors/DropDownFlexibleConfiguration.cs

@@ -1,6 +1,6 @@
 namespace Umbraco.Core.PropertyEditors
 {
-    internal class DropDownFlexibleConfiguration : ValueListConfiguration
+    public class DropDownFlexibleConfiguration : ValueListConfiguration
     {
         [ConfigurationField("multiple", "Enable multiple choice", "boolean", Description = "When checked, the dropdown will be a select multiple / combo box style dropdown.")]
         public bool Multiple { get; set; }

src/Umbraco.Core/Services/Implement/ContentService.cs

@@ -1902,9 +1902,8 @@ namespace Umbraco.Core.Services.Implement
             content.ParentId = parentId;
 
             // get the level delta (old pos to new pos)
-            var levelDelta = parent == null
+            // note that recycle bin (id:-20) level is 0!
-                ? 1 - content.Level + (parentId == Constants.System.RecycleBinContent ? 1 : 0)
+            var levelDelta = 1 - content.Level + (parent?.Level ?? 0);
-                : parent.Level + 1 - content.Level;
 
             var paths = new Dictionary<int, string>();
 

src/Umbraco.Core/Services/Implement/MediaService.cs

@@ -975,9 +975,8 @@ namespace Umbraco.Core.Services.Implement
             media.ParentId = parentId;
 
             // get the level delta (old pos to new pos)
-            var levelDelta = parent == null
+            // note that recycle bin (id:-20) level is 0!
-                ? 1 - media.Level + (parentId == Constants.System.RecycleBinMedia ? 1 : 0)
+            var levelDelta = 1 - media.Level + (parent?.Level ?? 0);
-                : parent.Level + 1 - media.Level;
 
             var paths = new Dictionary<int, string>();
 
@@ -1024,6 +1023,7 @@ namespace Umbraco.Core.Services.Implement
         /// <summary>
         /// Empties the Recycle Bin by deleting all <see cref="IMedia"/> that resides in the bin
         /// </summary>
+        /// <param name="userId">Optional Id of the User emptying the Recycle Bin</param>        
         public OperationResult EmptyRecycleBin()
         {
             var nodeObjectType = Constants.ObjectTypes.Media;

src/Umbraco.Web.UI.Client/src/common/services/editor.service.js

@@ -112,6 +112,7 @@ When building a custom infinite editor view you can use the same components as a
                         type="button"
                         button-style="link"
                         label-key="general_close"
+                        shortcut="esc"
                         action="vm.close()">
                     </umb-button>
                     <umb-button

src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.controller.js

@@ -1,21 +1,21 @@
-function imageFilePickerController($scope) {
+function imageFilePickerController($scope, editorService) {
 
     $scope.add = function() {
-        $scope.mediaPickerOverlay = {
+        var mediaPickerOptions = {
             view: "mediapicker",
+            multiPicker: false,
             disableFolderSelect: true,
             onlyImages: true,
-            show: true,
             submit: function (model) {
                 $scope.model.value = model.selection[0].image;
-                $scope.mediaPickerOverlay.show = false;
+
-                $scope.mediaPickerOverlay = null;
+                editorService.close();
             },
             close: function () {
-                $scope.mediaPickerOverlay.show = false;
+                editorService.close();
-                $scope.mediaPickerOverlay = null;
             } 
         };
+        editorService.mediaPicker(mediaPickerOptions);
     };
 
     $scope.remove = function () {

src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html

@@ -19,11 +19,4 @@
         <i class="icon icon-add large"></i>
     </a>
 
-    <umb-overlay
-      ng-if="mediaPickerOverlay.show"
-      model="mediaPickerOverlay"
-      view="mediaPickerOverlay.view"
-      position="right">
-    </umb-overlay>
-
 </div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js

@@ -0,0 +1,22 @@
+function ConfigController($scope) {
+
+    var vm = this;
+
+    vm.submit = submit;
+    vm.close = close;
+
+    function submit() {
+        if ($scope.model && $scope.model.submit) {
+            $scope.model.submit($scope.model);
+        }
+    }
+
+    function close() {
+        if ($scope.model.close) {
+            $scope.model.close();
+        }
+    }
+    
+}
+
+angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.ConfigController", ConfigController);

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html

@@ -1,16 +1,61 @@
-<div ng-if="model.config">
+<div ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.ConfigController as vm">
-    <umb-property
+
-        property="configValue"
+    <umb-editor-view>
-        ng-repeat="configValue in model.config">
+
-        <umb-property-editor model="configValue" is-pre-value="true"></umb-property-editor>
+        <umb-editor-header
-    </umb-property>
+            name="model.title"
-</div>
+            name-locked="true"
+            hide-alias="true"
+            hide-icon="true"
+            hide-description="true">
+        </umb-editor-header>
+
+        <umb-editor-container>
+            <ng-form name="gridItemConfigEditor" val-form-manager>
+
+                <umb-box ng-if="model.config">
+                    <umb-box-header title-key="grid_settings" />
+                    <umb-box-content>
+                        <div>
+                            <umb-property property="configValue"
+                                          ng-repeat="configValue in model.config">
+                                <umb-property-editor model="configValue" is-pre-value="true"></umb-property-editor>
+                            </umb-property>
+                        </div>
+                    </umb-box-content>
+                </umb-box>
+
+                <umb-box ng-if="model.styles">
+                    <umb-box-header title-key="grid_styles" />
+                    <umb-box-content>
+                        <div>
+                            <umb-property property="styleValue"
+                                          ng-repeat="styleValue in model.styles">
+                                <umb-property-editor model="styleValue" is-pre-value="true"></umb-property-editor>
+                            </umb-property>
+                        </div>
+                    </umb-box-content>
+                </umb-box>
+
+            </ng-form>
+        </umb-editor-container>
+
+        <umb-editor-footer>
+            <umb-editor-footer-content-right>
+                <umb-button type="button"
+                            button-style="link"
+                            label-key="general_close"
+                            shortcut="esc"
+                            action="vm.close()">
+                </umb-button>
+                <umb-button type="button"
+                            button-style="success"
+                            label-key="general_submit"
+                            action="vm.submit()">
+                </umb-button>
+            </umb-editor-footer-content-right>
+        </umb-editor-footer>
+
+    </umb-editor-view>
 
-<div ng-if="model.styles">
-    <h4>Style</h4>
-    <umb-property
-        property="styleValue"
-        ng-repeat="styleValue in model.styles">
-        <umb-property-editor model="styleValue" is-pre-value="true"></umb-property-editor>
-    </umb-property>
 </div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js

@@ -1,16 +1,22 @@
 function EditConfigController($scope) {
 
-    $scope.close = function() {
+    var vm = this;
-        if($scope.model.close) {
+
+    vm.submit = submit;
+    vm.close = close;
+
+    function submit() {
+        if ($scope.model && $scope.model.submit) {
+            $scope.model.submit($scope.model);
+        }
+    }
+
+    function close() {
+        if ($scope.model.close) {
             $scope.model.close();
         }
     }
 
-    $scope.submit = function() {
-        if($scope.model && $scope.model.submit) {
-            $scope.model.submit($scope.model);
-        }
-    }
 }
 
 angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.EditConfigController", EditConfigController);

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html

@@ -1,10 +1,8 @@
-<div class="usky-grid usky-grid-configuration" ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.EditConfigController">
+<div class="usky-grid usky-grid-configuration" ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.EditConfigController as vm">
 
+    <umb-editor-view>
 
-
+        <form novalidate name="EditConfigForm" val-form-manager>
-        <umb-editor-view>
-
-            <form novalidate name="EditConfigForm" val-form-manager>
 
             <umb-editor-header
                 name="model.title"
@@ -18,44 +16,39 @@
                 <umb-box>
                     <umb-box-content>
 
+                        <ng-form name="gridConfigEditor">
 
+                            <h4>{{model.name}}</h4>
+                            <p>Settings will only save if the entered json configuration is valid</p>
+                            <textarea name="configSource"
+                                validate-on="'blur'"
+                                rows="20" class="umb-property-editor umb-textarea"
+                                umb-raw-model="model.config"></textarea>
 
-<form name="gridConfigEditor">
+                            <div class="alert alert-error" ng-show="gridConfigEditor.$invalid === true">
+                                This configuration is not valid json, and will not be saved.
+                            </div>
 
-   <h4>{{model.name}}</h4>
+                        </ng-form>
-   <p>Settings will only save if the entered json configuration is valid</p>
-   <textarea name="configSource"
-      validate-on="'blur'"
-      rows="20" class="umb-property-editor umb-textarea"
-      umb-raw-model="model.config"></textarea>
 
-   <div class="alert alert-error" ng-show="gridConfigEditor.$invalid === true">
+                    </umb-box-content>
-      This configuration is not valid json, and will not be saved.
+                </umb-box>
-   </div>
+            </umb-editor-container>
 
-</form>
+            <umb-editor-footer>
-
+                <umb-editor-footer-content-right>
-
-
-
-                            </umb-box-content>
-                        </umb-box>
-                    </umb-editor-container>
-
-                    <umb-editor-footer>
-                    <umb-editor-footer-content-right>
                     <umb-button
                         type="button"
                         button-style="link"
                         label-key="general_close"
                         shortcut="esc"
-                        action="close()">
+                        action="vm.close()">
                     </umb-button>
                     <umb-button
                         type="button"
                         button-style="success"
                         label-key="general_submit"
-                        action="submit()">
+                        action="vm.submit()">
                     </umb-button>
                 </umb-editor-footer-content-right>
             </umb-editor-footer>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js

@@ -8,17 +8,20 @@ angular.module("umbraco")
         umbRequestHelper,
         angularHelper,
         $element,
-        eventsService
+            eventsService,
+            editorService
     ) {
 
         // Grid status variables
         var placeHolder = "";
         var currentForm = angularHelper.getCurrentForm($scope);
 
+        
         $scope.currentRow = null;
         $scope.currentCell = null;
         $scope.currentToolsControl = null;
         $scope.currentControl = null;
+        
         $scope.openRTEToolbarId = null;
         $scope.hasSettings = false;
         $scope.showRowConfigurations = true;
@@ -238,8 +241,10 @@ angular.module("umbraco")
                 $scope.$apply(function () {
 
                     var cell = event.target.getScope_HackForSortable().area;
+                    
                     cell.hasActiveChild = hasActiveChild(cell, cell.controls);
                     cell.active = false;
+                    
                 });
             }
 
@@ -273,7 +278,7 @@ angular.module("umbraco")
             localizationService.localize("grid_insertControl").then(function(value){
                 title = value;
                 $scope.editorOverlay = {
-                    view: "itempicker",
+                        view: "itempicker",
                     filter: area.$allowedEditors.length > 15,
                     title: title,
                     availableItems: area.$allowedEditors,
@@ -314,6 +319,7 @@ angular.module("umbraco")
 
         $scope.clickOutsideRow = function(index, rows) {
             rows[index].active = false;
+            
         };
 
         function getAllowedLayouts(section) {
@@ -431,44 +437,46 @@ angular.module("umbraco")
                 });
             }
 
-            $scope.gridItemSettingsDialog = {};
+                var dialogOptions = {
-            $scope.gridItemSettingsDialog.view = "views/propertyeditors/grid/dialogs/config.html";
+                    view: "views/propertyeditors/grid/dialogs/config.html",
-            $scope.gridItemSettingsDialog.title = "Settings";
+                    size: "small",
-            $scope.gridItemSettingsDialog.styles = styles;
+                    styles: styles,
-            $scope.gridItemSettingsDialog.config = config;
+                    config: config,
+                    submit: function (model) {
+                    var styleObject = {};
+                    var configObject = {};
 
-            $scope.gridItemSettingsDialog.show = true;
+                    _.each(model.styles, function (style) {
+                        if (style.value) {
+                            styleObject[style.key] = addModifier(style.value, style.modifier);
+                        }
+                    });
+                    _.each(model.config, function (cfg) {
+                            cfg.alias = cfg.key;
+                            cfg.label = cfg.value;
 
-            $scope.gridItemSettingsDialog.submit = function(model) {
+                        if (cfg.value) {
+                            configObject[cfg.key] = addModifier(cfg.value, cfg.modifier);
+                        }
+                    });
 
-                var styleObject = {};
+                    gridItem.styles = styleObject;
-                var configObject = {};
+                    gridItem.config = configObject;
+                    gridItem.hasConfig = gridItemHasConfig(styleObject, configObject);
 
-                _.each(model.styles, function(style){
+                    currentForm.$setDirty();
-                    if(style.value){
+
-                        styleObject[style.key] = addModifier(style.value, style.modifier);
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
                     }
-                });
-                _.each(model.config, function (cfg) {
-                    if (cfg.value) {
-                        configObject[cfg.key] = addModifier(cfg.value, cfg.modifier);
-                    }
-                });
-
-                gridItem.styles = styleObject;
-                gridItem.config = configObject;
-                gridItem.hasConfig = gridItemHasConfig(styleObject, configObject);
-
-                currentForm.$setDirty();
-
-                $scope.gridItemSettingsDialog.show = false;
-                $scope.gridItemSettingsDialog = null;
             };
 
-            $scope.gridItemSettingsDialog.close = function(oldModel) {
+                localizationService.localize("general_settings").then(value => {
-                $scope.gridItemSettingsDialog.show = false;
+                    dialogOptions.title = value;
-                $scope.gridItemSettingsDialog = null;
+                    editorService.open(dialogOptions);
-            };
+                });
 
         };
 
@@ -538,6 +546,7 @@ angular.module("umbraco")
         // Control management functions
         // *********************************************
         $scope.clickControl = function (index, controls, cell) {
+            
             controls[index].active = true;
             cell.hasActiveChild = true;
         };

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html

@@ -305,11 +305,4 @@
       position="target">
     </umb-overlay>
 
-    <umb-overlay
-      ng-if="gridItemSettingsDialog.show"
-      model="gridItemSettingsDialog"
-      view="gridItemSettingsDialog.view"
-      position="right">
-    </umb-overlay>
-
 </div>

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -340,9 +340,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8010</DevelopmentServerPort>
+          <DevelopmentServerPort>8020</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8010</IISUrl>
+          <IISUrl>http://localhost:8020</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs

@@ -1381,19 +1381,24 @@ WHERE cmsContentNu.nodeId IN (
             long total;
             do
             {
+                // the tree is locked, counting and comparing to total is safe
                 var descendants = _documentRepository.GetPage(query, pageIndex++, groupSize, out total, null, Ordering.By("Path"));
                 var items = new List<ContentNuDto>();
+                var count = 0;
                 foreach (var c in descendants)
                 {
                     // always the edited version
                     items.Add(GetDto(c, false));
+
                     // and also the published version if it makes any sense
                     if (c.Published)
                         items.Add(GetDto(c, true));
+
+                    count++;
                 }
 
                 db.BulkInsertRecords(items);
-                processed += items.Count;
+                processed += count;
             } while (processed < total);
         }
 
@@ -1448,10 +1453,11 @@ WHERE cmsContentNu.nodeId IN (
             long total;
             do
             {
+                // the tree is locked, counting and comparing to total is safe
                 var descendants = _mediaRepository.GetPage(query, pageIndex++, groupSize, out total, null, Ordering.By("Path"));
-                var items = descendants.Select(m => GetDto(m, false)).ToArray();
+                var items = descendants.Select(m => GetDto(m, false)).ToList();
                 db.BulkInsertRecords(items);
-                processed += items.Length;
+                processed += items.Count;
             } while (processed < total);
         }