Merge remote-tracking branch 'origin/v10/dev' into v11/dev

# Conflicts:
#	build/azure-pipelines.yml
#	tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker

src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html

@@ -11,17 +11,19 @@
                     data-element="property-{{property.alias}}"
                     ng-repeat="property in tab.properties track by property.alias"
                     property="property"
+                    node="contentNodeModel"
                     show-inherit="contentNodeModel.variants.length > 1 && property.variation !== 'CultureAndSegment'"
                     inherits-from="defaultVariant.displayName">
 
                     <umb-property-editor
                         model="property"
+                        node="contentNodeModel"
                         preview="(propertyEditorDisabled(property) && allowUpdate) || (!allowUpdate && !property.supportsReadOnly)"
                         allow-unlock="allowUpdate && allowEditInvariantFromNonDefault"
                         on-unlock="unlockInvariantValue(property)"
                         ng-attr-readonly="{{ !allowUpdate || undefined}}">
                     </umb-property-editor>
-                    
+
                 </umb-property>
             </umb-box-content>
         </umb-box>

src/Umbraco.Web.UI.Client/src/views/content/apps/listview/listview.controller.js

@@ -9,9 +9,9 @@
 
     function propertyEditorReadonly () {
       // check for permission to update
-      return !(typeof $scope.variantContent !== 'undefined' && $scope.variantContent.allowedActions.includes('A'));
+      return $scope.variantContent && !$scope.variantContent.allowedActions.includes('A');
     }
-      
+
   }
 
   angular.module("umbraco").controller("Umbraco.Editors.Content.Apps.ListViewController", ContentAppListViewController);

src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.settings.html

@@ -8,9 +8,9 @@
 
                 <ng-form name="propertyEditorForm">
 
-                    <div 
-                        ng-model="model.content.selectedEditor" 
-                        name="selectedEditor" 
+                    <div
+                        ng-model="model.content.selectedEditor"
+                        name="selectedEditor"
                         val-require-component
                         class="umb-property-editor--limit-width">
 
@@ -23,7 +23,7 @@
                             ng-click="vm.openPropertyEditorPicker()">
                         </umb-button>
 
-                        <div ng-messages="propertyEditorForm.selectedEditor.$error" show-validation-on-submit>
+                        <div class="help-inline" ng-messages="propertyEditorForm.selectedEditor.$error" show-validation-on-submit>
                             <span ng-message="valRequiredComponent">
                                 <localize key="general_required">Required</localize>
                             </span>

src/Umbraco.Web.UI.Client/src/views/macros/views/macro.settings.controller.js

@@ -14,11 +14,11 @@ function MacrosSettingsController($scope, editorService, localizationService) {
     //vm.removeMacroView = removeMacroView;
     $scope.model.openViewPicker = openViewPicker;
     $scope.model.removeMacroView = removeMacroView;
-
     var labels = {};
-
+    vm.macroPartialViewPickerProperty = { alias : "macroPartialViewPickerProperty", description: "", label: "Macro partial view", validation: {mandatory : true}}
     localizationService.localizeMany(["macro_selectViewFile"]).then(function(data) {
         labels.selectViewFile = data[0];
+        vm.macroPartialViewPickerProperty.description = data[0];
     });
 
     function openViewPicker() {
@@ -45,7 +45,7 @@ function MacrosSettingsController($scope, editorService, localizationService) {
                     name: $scope.model.macro.view
                 };
 
-                //$scope.model.submit($scope.model); 
+                //$scope.model.submit($scope.model);
 
                 editorService.close();
             },
@@ -63,7 +63,7 @@ function MacrosSettingsController($scope, editorService, localizationService) {
     }
 
     function init() {
-        
+
     }
 
     init();

src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html

@@ -5,10 +5,9 @@
         <div class="umb-package-details__main-content">
 
             <umb-box>
-                <umb-box-header title="Macro partial view"></umb-box-header>
                 <umb-box-content>
-                    <umb-control-group label="Macro partial view" required="true" hide-label="true">
-
+                  <umb-property property="vm.macroPartialViewPickerProperty">
+                      <ng-form  name="vm.macroPartialViewPickerForm">
                         <umb-node-preview
                             ng-if="model.macro.node"
                             icon="model.macro.node.icon"
@@ -19,7 +18,7 @@
                             on-remove="model.removeMacroView()">
                         </umb-node-preview>
 
-                        <input type="hidden" ng-model="mandatoryViewValidator" ng-required="!model.macro.node" />
+                        <input type="hidden" name="partialView" ng-model="mandatoryViewValidator" ng-required="!model.macro.node" />
 
                         <button type="button"
                                 class="umb-node-preview-add"
@@ -28,7 +27,13 @@
                             <localize key="general_add">Add</localize>
                         </button>
 
-                    </umb-control-group>
+                        <div class="help-inline" ng-messages="vm.macroPartialViewPickerForm.partialView.$error" show-validation-on-submit>
+                            <span ng-message="required">
+                                <localize key="general_required">Required</localize>
+                            </span>
+                        </div>
+                      </ng-form>
+                  </umb-property>
                 </umb-box-content>
             </umb-box>
             <umb-box>