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

Merge remote-tracking branch 'origin/user-group-permissions' into temp-U4-10075

Browse Source
This commit is contained in:
Shannon
2017-07-13 01:58:18 +10:00
parent 87dcdc596e f18b7110c9
commit df18cdc7f7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
View File

@@ -392,6 +392,7 @@
vm.page.createButtonState = "success";
vm.newUser = saved;
setUsersViewState('createUserSuccess');
getUsers();
}, function (err) {
formHelper.handleError(err);
vm.page.createButtonState = "error";

2
src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
View File

@@ -43,7 +43,7 @@ namespace Umbraco.Web.Editors
var dataType = (DataTypeSave)actionContext.ActionArguments["dataType"];
dataType.Name = dataType.Name.CleanForXss('[', ']', '(', ')', ':');
dataType.Alias = dataType.Alias.CleanForXss('[', ']', '(', ')', ':');
dataType.Alias = dataType.Alias == null ? dataType.Name : dataType.Alias.CleanForXss('[', ']', '(', ')', ':');
//Validate that the property editor exists
var propertyEditor = PropertyEditorResolver.Current.GetByAlias(dataType.SelectedEditor);