Merge branch 'v9/9.0-rc004' into v9/dev

Nuklon · Sep 22, 2021 · 9194eb9 · 9194eb9
2 parents a7495d5 + dd72c18
commit 9194eb9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Umbraco.Core/Models/Mapping/TabsAndPropertiesMapper.cs b/src/Umbraco.Core/Models/Mapping/TabsAndPropertiesMapper.cs
@@ -59,7 +59,8 @@ protected virtual void MapGenericProperties(IContentBase content, List<Tab<Conte
                 Id = 0,
                 Label = LocalizedTextService.Localize("general", "properties"),
                 Alias = "Generic properties",
-                Properties = genericproperties
+                Properties = genericproperties,
+                Type = PropertyGroupType.Group.ToString()
             });
 
             var genericProps = tabs.Single(x => x.Id == 0);

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
@@ -16,7 +16,7 @@
         var unsubscribe = [];
 
         function resetModel(isNew) {
-            //the model config will contain an object, if it does not we'll create defaults            
+            //the model config will contain an object, if it does not we'll create defaults
             /*
             {
                 hasPassword: true/false,
@@ -80,7 +80,7 @@
         }
 
         function onInit() {
-            //listen for the saved event, when that occurs we'll 
+            //listen for the saved event, when that occurs we'll
             //change to changing = false;
             unsubscribe.push($scope.$on("formSubmitted", function () {
                 if (vm.config.disableToggle === false) {
@@ -146,7 +146,7 @@
         }
     };
 
-    angular.module('umbraco.directives').component('changepassword', component);
+    angular.module('umbraco.directives').component('changePassword', component);
 
 
 })();