yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ensures the udi structure works always for the validation key

Browse Source
This commit is contained in:
Shannon
2020-07-01 13:00:56 +10:00
parent 7c6cf3710b
commit 086d7b6e23
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
View File

@@ -5,6 +5,15 @@
**/
angular.module("umbraco.directives")
.directive('umbProperty', function (userService, serverValidationManager, udiService) {
// if only a guid is passed in, we'll ensure a correct udi structure
function ensureUdi(udi) {
if (udi && !udi.startsWith("umb://")) {
udi = udiService.build("element", udi);
}
return udi;
}
return {
scope: {
property: "=",
@@ -29,9 +38,7 @@ angular.module("umbraco.directives")
});
}
if (scope.elementUdi && !scope.elementUdi.startsWith("umb://")) {
scope.elementUdi = udiService.build("element", scope.elementUdi);
}
scope.elementUdi = ensureUdi(scope.elementUdi);
},
//Define a controller for this directive to expose APIs to other directives
@@ -56,6 +63,7 @@ angular.module("umbraco.directives")
// the elementUdi will be empty when this is not a nested property
var propAlias = $scope.propertyAlias ? $scope.propertyAlias : $scope.property.alias;
$scope.elementUdi = ensureUdi($scope.elementUdi);
return serverValidationManager.createPropertyValidationKey(propAlias, $scope.elementUdi);
}
$scope.getValidationPath = self.getValidationPath;