diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs index 69ff951f26..5a2b9f23e7 100644 --- a/src/Umbraco.Tests/Services/ContentServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs @@ -1836,9 +1836,9 @@ namespace Umbraco.Tests.Services Assert.That(sut.GetValue("date").ToString("G"), Is.EqualTo(content.GetValue("date").ToString("G"))); Assert.That(sut.GetValue("ddl"), Is.EqualTo("1234")); Assert.That(sut.GetValue("chklist"), Is.EqualTo("randomc")); - Assert.That(sut.GetValue("contentPicker"), Is.EqualTo(1090)); - Assert.That(sut.GetValue("mediaPicker"), Is.EqualTo(1091)); - Assert.That(sut.GetValue("memberPicker"), Is.EqualTo(1092)); + Assert.That(sut.GetValue("contentPicker"), Is.EqualTo(Udi.Create(Constants.UdiEntityType.Document, new Guid("74ECA1D4-934E-436A-A7C7-36CC16D4095C")))); + Assert.That(sut.GetValue("mediaPicker"), Is.EqualTo(Udi.Create(Constants.UdiEntityType.Media, new Guid("44CB39C8-01E5-45EB-9CF8-E70AAF2D1691")))); + Assert.That(sut.GetValue("memberPicker"), Is.EqualTo(Udi.Create(Constants.UdiEntityType.Member, new Guid("9A50A448-59C0-4D42-8F93-4F1D55B0F47D")))); Assert.That(sut.GetValue("relatedLinks"), Is.EqualTo("")); Assert.That(sut.GetValue("tags"), Is.EqualTo("this,is,tags")); } diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs b/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs index e6e29b5593..63f504564a 100644 --- a/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs +++ b/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Umbraco.Core; using Umbraco.Core.Models; namespace Umbraco.Tests.TestHelpers.Entities @@ -123,9 +124,9 @@ namespace Umbraco.Tests.TestHelpers.Entities content.SetValue("date", DateTime.Now.AddDays(-10)); content.SetValue("ddl", "1234"); content.SetValue("chklist", "randomc"); - content.SetValue("contentPicker", 1090); - content.SetValue("mediaPicker", 1091); - content.SetValue("memberPicker", 1092); + content.SetValue("contentPicker", Udi.Create(Constants.UdiEntityType.Document, new Guid("74ECA1D4-934E-436A-A7C7-36CC16D4095C")).ToString()); + content.SetValue("mediaPicker", Udi.Create(Constants.UdiEntityType.Media, new Guid("44CB39C8-01E5-45EB-9CF8-E70AAF2D1691")).ToString()); + content.SetValue("memberPicker", Udi.Create(Constants.UdiEntityType.Member, new Guid("9A50A448-59C0-4D42-8F93-4F1D55B0F47D")).ToString()); content.SetValue("relatedLinks", ""); content.SetValue("tags", "this,is,tags"); diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs index 4d421e9bdf..4332dd3d86 100644 --- a/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs +++ b/src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs @@ -357,9 +357,9 @@ namespace Umbraco.Tests.TestHelpers.Entities contentCollection.Add(new PropertyType(Constants.PropertyEditors.DateAlias, DataTypeDatabaseType.Date) { Alias = "date", Name = "Date", Mandatory = false, SortOrder = 13, DataTypeDefinitionId = -41 }); contentCollection.Add(new PropertyType(Constants.PropertyEditors.DropDownListAlias, DataTypeDatabaseType.Integer) { Alias = "ddl", Name = "Dropdown List", Mandatory = false, SortOrder = 14, DataTypeDefinitionId = -42 }); contentCollection.Add(new PropertyType(Constants.PropertyEditors.CheckBoxListAlias, DataTypeDatabaseType.Nvarchar) { Alias = "chklist", Name = "Checkbox List", Mandatory = false, SortOrder = 15, DataTypeDefinitionId = -43 }); - contentCollection.Add(new PropertyType(Constants.PropertyEditors.ContentPicker2Alias, DataTypeDatabaseType.Integer) { Alias = "contentPicker", Name = "Content Picker", Mandatory = false, SortOrder = 16, DataTypeDefinitionId = 1046 }); - contentCollection.Add(new PropertyType(Constants.PropertyEditors.MediaPicker2Alias, DataTypeDatabaseType.Integer) { Alias = "mediaPicker", Name = "Media Picker", Mandatory = false, SortOrder = 17, DataTypeDefinitionId = 1048 }); - contentCollection.Add(new PropertyType(Constants.PropertyEditors.MemberPicker2Alias, DataTypeDatabaseType.Integer) { Alias = "memberPicker", Name = "Member Picker", Mandatory = false, SortOrder = 18, DataTypeDefinitionId = 1047 }); + contentCollection.Add(new PropertyType(Constants.PropertyEditors.ContentPicker2Alias, DataTypeDatabaseType.Nvarchar) { Alias = "contentPicker", Name = "Content Picker", Mandatory = false, SortOrder = 16, DataTypeDefinitionId = 1046 }); + contentCollection.Add(new PropertyType(Constants.PropertyEditors.MediaPicker2Alias, DataTypeDatabaseType.Ntext) { Alias = "mediaPicker", Name = "Media Picker", Mandatory = false, SortOrder = 17, DataTypeDefinitionId = 1048 }); + contentCollection.Add(new PropertyType(Constants.PropertyEditors.MemberPicker2Alias, DataTypeDatabaseType.Nvarchar) { Alias = "memberPicker", Name = "Member Picker", Mandatory = false, SortOrder = 18, DataTypeDefinitionId = 1047 }); contentCollection.Add(new PropertyType(Constants.PropertyEditors.RelatedLinks2Alias, DataTypeDatabaseType.Ntext) { Alias = "relatedLinks", Name = "Related Links", Mandatory = false, SortOrder = 21, DataTypeDefinitionId = 1050 }); contentCollection.Add(new PropertyType(Constants.PropertyEditors.TagsAlias, DataTypeDatabaseType.Ntext) { Alias = "tags", Name = "Tags", Mandatory = false, SortOrder = 22, DataTypeDefinitionId = 1041 }); diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less index 6e616c6baa..faed098fc8 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less @@ -2,7 +2,6 @@ display: flex; border-bottom: 1px solid @gray-9; padding: 7px 0; - cursor: pointer; } .umb-permission:last-of-type { @@ -10,7 +9,15 @@ } .umb-permission__toggle { - margin-right: 20px; + padding-right: 20px; + cursor: pointer; +} + +.umb-permission__content { + display: flex; + flex-direction: column; + flex: 1 1 auto; + cursor: pointer; } .umb-permission__description { diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less index 0579d2c0c5..e90a053a3d 100644 --- a/src/Umbraco.Web.UI.Client/src/less/sections.less +++ b/src/Umbraco.Web.UI.Client/src/less/sections.less @@ -87,9 +87,10 @@ ul.sections li.avatar a { border: none } -ul.sections li.avatar a img { +ul.sections li.avatar a div { border-radius: 50%; width: 30px; + margin:0 auto; } ul.sections li.avatar a span { diff --git a/src/Umbraco.Web.UI.Client/src/less/tables.less b/src/Umbraco.Web.UI.Client/src/less/tables.less index 57a8e0826b..3c63785957 100644 --- a/src/Umbraco.Web.UI.Client/src/less/tables.less +++ b/src/Umbraco.Web.UI.Client/src/less/tables.less @@ -17,10 +17,6 @@ table thead { background-color: @gray-10; } -table tr:hover { - background-color: @gray-10; -} - // BASELINE STYLES // --------------- diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index 666941b914..635d75d895 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -152,7 +152,7 @@ // ------------------------- @tableBackground: transparent; // overall background-color @tableBackgroundAccent: @gray-10; // for striping -@tableBackgroundHover: @gray-9; // for hover +@tableBackgroundHover: @gray-10; // for hover @tableBorder: @gray-8; // table and cell border // Buttons diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-permission.html b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-permission.html index d33584f73b..3385b8e073 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-permission.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-permission.html @@ -4,7 +4,7 @@ checked="selected" on-click="change(checked)"> -
+
{{ name }}
{{ description }}
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/rights.html b/src/Umbraco.Web.UI.Client/src/views/content/rights.html index 7ba9cff16a..c83054212f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/rights.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/rights.html @@ -27,8 +27,8 @@ Set permissions for... - -
    + +
    • diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js index 76d1599508..404c311d8b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js @@ -127,7 +127,7 @@ var i2 = parseFloat($scope.model.config.initVal2); sliderVal = [ isNaN(i1) ? $scope.model.config.minVal : (i1 >= $scope.model.config.minVal ? i1 : $scope.model.config.minVal), - isNaN(i2) ? $scope.model.config.maxVal : (i2 > i1 ? (i2 <= $scope.model.config.maxVal ? i2 : $scope.model.config.maxVal) : $scope.model.config.maxVal) + isNaN(i2) ? $scope.model.config.maxVal : (i2 >= i1 ? (i2 <= $scope.model.config.maxVal ? i2 : $scope.model.config.maxVal) : $scope.model.config.maxVal) ]; } else { diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.html b/src/Umbraco.Web.UI.Client/src/views/users/user.html index bb54a69db9..84e50a3360 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/user.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/user.html @@ -1,346 +1,366 @@
      - + -
      + - + - - + + - + -
      +
      -
      +
      -
      +
      -
      -
      -
      Profile
      -
      -
      +
      +
      +
      + Profile +
      +
      +
      - - - Required - - + + + Required + + - - - Required - - + + + Required + + - - - Required - - -
      -
      + + + Required + + +
      +
      -
      -
      -
      Access
      -
      -
      +
      +
      +
      + Access +
      +
      +
      - + - - + + - - Add - + + Add + - + - + - - + + - - + + - - Add - + + Add + - + - + - - + + - - + + - - Add - + + Add + - + -
      -
      -
      +
      +
      +
      -
      +
      -
      +
      -
      - +
      + - - + + - - - -
      - - - Change photo - - - - Remove photo - + + + +
      + + + Change photo + + + + Remove photo + + +
      + + + +
      + +
      +
      + Status:
      +
      + + {{vm.user.userDisplayState.name}} + +
      +
      + +
      +
      + Last login:
      +
      + {{ vm.user.lastLoginDate }} + {{ vm.user.name }} has not logged in yet +
      +
      + +
      +
      + + +
      + +
      + + +
      + + + + + + + + + + + + + + +
      +


      Password reset to value: {{vm.user.resetPasswordValue}}

      +
      + +
      + +
      + +
      - -
      -
      -
      Status:
      -
      - - {{vm.user.userDisplayState.name}} - -
      -
      + -
      -
      Last login:
      -
      - {{ vm.user.lastLoginDate }} - {{ vm.user.name }} has not logged in yet -
      -
      + -
      -
      - - -
      + -
      - - -
      - - - + + - +       - - + - + - + + -
      + -


      Password reset to value: {{vm.user.resetPasswordValue}}

      -
      + -
      + -
      + -
      + + -
      + + -
      + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      +
      \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js index dd544fc94e..96db5e07b1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js @@ -14,11 +14,11 @@ vm.newUser = {}; vm.usersOptions = {}; vm.userSortData = [ - { label: "Name (A-Z)", key: "Name", direction: "Ascending" }, - { label: "Name (Z-A)", key: "Name", direction: "Descending" }, - { label: "Newest", key: "CreateDate", direction: "Descending" }, - { label: "Oldest", key: "CreateDate", direction: "Ascending" }, - { label: "Last login", key: "LastLoginDate", direction: "Descending" } + { label: "Name (A-Z)", key: "Name", direction: "Ascending" }, + { label: "Name (Z-A)", key: "Name", direction: "Descending" }, + { label: "Newest", key: "CreateDate", direction: "Descending" }, + { label: "Oldest", key: "CreateDate", direction: "Ascending" }, + { label: "Last login", key: "LastLoginDate", direction: "Descending" } ]; vm.userStatesFilter = []; vm.newUser.userGroups = []; @@ -111,11 +111,11 @@ } function getSortLabel(sortKey, sortDirection) { - var found = _.find(vm.userSortData, - function (i) { - return i.key === sortKey && i.direction === sortDirection; - }); - return found ? found.label : sortKey; + var found = _.find(vm.userSortData, + function (i) { + return i.key === sortKey && i.direction === sortDirection; + }); + return found ? found.label : sortKey; } function toggleFilter(type) { @@ -160,7 +160,7 @@ function selectUser(user, selection, event) { // prevent the current user to be selected - if(!user.isCurrentUser) { + if (!user.isCurrentUser) { if (user.selected) { var index = selection.indexOf(user.id); @@ -170,10 +170,10 @@ user.selected = true; vm.selection.push(user.id); } - + setBulkActions(vm.users); - if(event){ + if (event) { event.preventDefault(); event.stopPropagation(); } @@ -188,7 +188,7 @@ } function clickUser(user) { - if(vm.selection.length > 0) { + if (vm.selection.length > 0) { selectUser(user, vm.selection); } else { goToUser(user.id); @@ -198,22 +198,22 @@ function disableUsers() { vm.disableUserButtonState = "busy"; usersResource.disableUsers(vm.selection).then(function (data) { - // update userState - angular.forEach(vm.selection, function (userId) { - var user = getUserFromArrayById(userId, vm.users); - if (user) { - user.userState = 1; - } - }); - // show the correct badges - setUserDisplayState(vm.users); + // update userState + angular.forEach(vm.selection, function (userId) { + var user = getUserFromArrayById(userId, vm.users); + if (user) { + user.userState = 1; + } + }); + // show the correct badges + setUserDisplayState(vm.users); - formHelper.showNotifications(data); - - vm.disableUserButtonState = "init"; - clearSelection(); + formHelper.showNotifications(data); - }, function(error){ + vm.disableUserButtonState = "init"; + clearSelection(); + + }, function (error) { vm.disableUserButtonState = "error"; formHelper.showNotifications(error.data); }); @@ -222,27 +222,27 @@ function enableUsers() { vm.enableUserButtonState = "busy"; usersResource.enableUsers(vm.selection).then(function (data) { - // update userState - angular.forEach(vm.selection, function (userId) { - var user = getUserFromArrayById(userId, vm.users); - if (user) { - user.userState = 0; - } - }); - // show the correct badges - setUserDisplayState(vm.users); - // show notification - formHelper.showNotifications(data); - vm.enableUserButtonState = "init"; - clearSelection(); + // update userState + angular.forEach(vm.selection, function (userId) { + var user = getUserFromArrayById(userId, vm.users); + if (user) { + user.userState = 0; + } + }); + // show the correct badges + setUserDisplayState(vm.users); + // show notification + formHelper.showNotifications(data); + vm.enableUserButtonState = "init"; + clearSelection(); }, function (error) { vm.enableUserButtonState = "error"; - formHelper.showNotifications(error.data); + formHelper.showNotifications(error.data); }); } function getUserFromArrayById(userId, users) { - return _.find(users, function(u) { return u.id === userId }); + return _.find(users, function (u) { return u.id === userId }); } function openBulkUserGroupPicker(event) { @@ -264,7 +264,7 @@ }); // apply changes to UI _.each(vm.selection, - function(userId) { + function (userId) { var user = getUserFromArrayById(userId, vm.users); user.userGroups = vm.selectedBulkUserGroups; }); @@ -327,7 +327,7 @@ // select all users angular.forEach(vm.users, function (user) { // prevent the current user to be selected - if(!user.isCurrentUser) { + if (!user.isCurrentUser) { user.selected = true; vm.selection.push(user.id); } @@ -339,11 +339,11 @@ // we need to check if the current user is part of the selection and // subtract the user from the total selection to find out if all users are selected var includesCurrentUser = vm.users.some(function (user) { return user.isCurrentUser === true; }); - - if(includesCurrentUser) { - if (vm.selection.length === vm.users.length - 1) { return true;} + + if (includesCurrentUser) { + if (vm.selection.length === vm.users.length - 1) { return true; } } else { - if (vm.selection.length === vm.users.length) { return true;} + if (vm.selection.length === vm.users.length) { return true; } } } @@ -362,7 +362,7 @@ var found = false; angular.forEach(array, function (item) { if (item.selected) { - if(!found) { + if (!found) { name = item.name found = true; } else { @@ -374,14 +374,14 @@ } function setUserStatesFilter(userState) { - + if (!vm.usersOptions.userStates) { vm.usersOptions.userStates = []; } //If the selection is "ALL" then we need to unselect everything else since this is an 'odd' filter if (userState.key === "All") { - angular.forEach(vm.userStatesFilter, function(i) { + angular.forEach(vm.userStatesFilter, function (i) { i.selected = false; }); //we can't unselect All @@ -397,7 +397,7 @@ }); var indexOfAll = vm.usersOptions.userStates.indexOf("All"); if (indexOfAll >= 0) { - vm.usersOptions.userStates.splice(indexOfAll, 1); + vm.usersOptions.userStates.splice(indexOfAll, 1); } } @@ -414,11 +414,11 @@ function setUserGroupFilter(userGroup) { - if(!vm.usersOptions.userGroups) { + if (!vm.usersOptions.userGroups) { vm.usersOptions.userGroups = []; } - if(userGroup.selected) { + if (userGroup.selected) { vm.usersOptions.userGroups.push(userGroup.alias); } else { var index = vm.usersOptions.userGroups.indexOf(userGroup.alias); @@ -472,6 +472,9 @@ .then(function (saved) { //success vm.page.createButtonState = "success"; + vm.newUser = saved; + setUsersViewState('inviteUserSuccess'); + getUsers(); }, function (err) { //error formHelper.handleError(err); @@ -489,7 +492,7 @@ function copySuccess() { vm.page.copyPasswordButtonState = "success"; } - + // copy to clip board error function copyError() { vm.page.copyPasswordButtonState = "error"; @@ -520,7 +523,7 @@ vm.loading = false; - }, function(error){ + }, function (error) { vm.loading = false; @@ -528,7 +531,7 @@ } function setUserDisplayState(users) { - angular.forEach(users, function(user){ + angular.forEach(users, function (user) { user.userDisplayState = usersHelper.getUserStateFromValue(user.userState); }); } @@ -557,22 +560,22 @@ } // if the current user is selected prevent any bulk actions with the user included - if(user.isCurrentUser) { + if (user.isCurrentUser) { vm.allowDisableUser = false; vm.allowEnableUser = false; vm.allowSetUserGroup = false; return; } - if(user.userDisplayState && user.userDisplayState.key === "Disabled") { + if (user.userDisplayState && user.userDisplayState.key === "Disabled") { vm.allowDisableUser = false; } - if(user.userDisplayState && user.userDisplayState.key === "Active") { + if (user.userDisplayState && user.userDisplayState.key === "Active") { vm.allowEnableUser = false; } - if(user.userDisplayState && user.userDisplayState.key === "Invited") { + if (user.userDisplayState && user.userDisplayState.key === "Invited") { vm.allowEnableUser = false; } @@ -584,7 +587,7 @@ // for 2nd+ selected user, compare the user group aliases to determine if we should allow bulk editing. // we don't allow bulk editing of users not currently having the same assigned user groups, as we can't // really support that in the user group picker. - var userGroups = user.userGroups.map(function(ug) { return ug.alias; }); + var userGroups = user.userGroups.map(function (ug) { return ug.alias; }); if (_.difference(firstSelectedUserGroups, userGroups).length > 0) { vm.allowSetUserGroup = false; } diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html index b783e250a5..c938329926 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html @@ -1,464 +1,519 @@
      - + +
      - -
      + - + - - - - - + + + + + - - - - - - -
      -
      - - -
      -
      -       -       + + + + + + +
      +
      + + +
      +
      +       +       - - - - - - - - {{ vm.selection.length }} of {{ vm.users.length }} selected - - - - -
      - + + + + + + + {{ vm.selection.length }} of {{ vm.users.length }} selected + + + + + +
      + - -
      -
      - +
      +
      + - -
      -
      - +
      +
      + - -
      -       +       +
      +       -       +       - -
      + +
      -
      - Users ({{vm.usersOptions.totalItems}}) -
      - -
      - - -
      - - Status: - {{ vm.getFilterName(vm.userStatesFilter) }} - - - - -
      - - -
      -       -       -
      - - -
      - - : - {{ vm.getFilterName(vm.userGroups) }} - - - - -
      - - -
      -       -       -
      - - - - -
      - -
      - - - - - - - -
      - -
      - - {{ user.userDisplayState.name }} - -
      - - -
      -
      - -
      -
      {{user.name}}
      -
      - {{ userGroup.name }}, -
      -       - -
      - - - - - - - - - - - - - - - - - - - - - - -
      - - NameUser groupLast loginStatus
      -
      - - -
      -       		- - - {{user.name}}{{ userGroup.name }}, {{ user.formattedLastLogin }} - - {{ user.userDisplayState.name }} - -
      - -
      - - -
      - - -
      - -
      - - -
      - - - - ← Back to users - - - -
      -
      -
      -
      -

      Invite User

      -

      - -

      -
      -
      -

      Create user

      -

      - -

      -
      - - - Required - - + + + + - - - Required - - + +
      + +
      + + {{ user.userDisplayState.name }} + +
      + + +
      +
      + +
      +
      {{user.name}}
      +
      + {{ userGroup.name }}, +
      + +
      +       +
      - + +
      - - + + + + + + + + + + + + + + + + + + + + + +
      + + + + NameUser groupLast loginStatus
      +
      + + +
      +       		+ + + {{user.name}}{{ userGroup.name }}, {{ user.formattedLastLogin }} + + {{ user.userDisplayState.name }} + +
      - - Add - +
      -       + +
      + + +
      - - - Required - - +
      - +
      + + + + ← Back to users + + + +
      + +
      +
      +

      + Invite User +

      +

      + +

      +
      +
      +

      + Create user +

      +

      + +

      +
      +
      + + + + Required + + + + + + Required + + + + + + + + + + Add + + + + + + + Required + + + + - + - - + - + -
      -
      - - -
      - - - ← Back to users - - - -
      -
      -
      - - -

      - {{vm.newUser.name | umbWordLimit:1}} has been created -

      -

      -
      +
      - + +
      + + + + ← Back to users + + -
      - -
      {{vm.newUser.resetPasswordValue}}
      -
      ••••••••
      +
      +
      + + +
      + + +

      + {{vm.newUser.name | umbWordLimit:1}} + has been created +

      +
      -
      - - +

      + + +
      + +
      +
      {{vm.newUser.resetPasswordValue}}
      +
      ••••••••
      +
      + + + + + + +
      +
      +
      - - - - - + +
      + + + + +
      -
      -
      -
      - - - - -
      -
      -
      - - + +
      + + + ← Back to users + + +
      +
      + +
      + + +

      + {{vm.newUser.name | umbWordLimit:1}} + has been created +

      +
      -
      +

      + + +
      + + + + +
      + +
      +
      + +
      + + + + +
      \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index d097094cc1..9cd531a403 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -1523,6 +1523,7 @@ To manage your website, simply open the Umbraco back office and start adding con Excerpt field Go to user profile Add groups to assign access and permissions + Invite another user Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Language Set the language you will see in menus and dialogs @@ -1569,6 +1570,8 @@ To manage your website, simply open the Umbraco back office and start adding con User group permissions User group User groups + has been invited + An invitation has been sent to the new user with details about how to log in to Umbraco. Writer Translator Change diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml index e387ab37ee..0031218444 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml @@ -383,7 +383,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]> Wszystkie typy właściwości & dane właściwości używające tego typu danych zostaną usunięte na zawsze, potwierdź, że chcesz je także usunąć Tak, usuń - i wszystkie typy właściwości & dane właściwości używające tego typu danych/key> + i wszystkie typy właściwości & dane właściwości używające tego typu danych Wybierz folder do przeniesienia do w strukturze drzewa poniżej został przeniesiony poniżej @@ -815,7 +815,7 @@ Naciśnij przycisk instaluj, aby zainstalować bazę danych Umb Powiadomienie - i wskaż gdzie jest zapisany. Pakiety Umbraco przeważnie posiadają rozszerzenie ".umb" lub ".zip". ]]> diff --git a/src/Umbraco.Web/Models/ContentEditing/UserInvite.cs b/src/Umbraco.Web/Models/ContentEditing/UserInvite.cs index 747f64bf7a..06895ccc68 100644 --- a/src/Umbraco.Web/Models/ContentEditing/UserInvite.cs +++ b/src/Umbraco.Web/Models/ContentEditing/UserInvite.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.Linq; using System.Runtime.Serialization; namespace Umbraco.Web.Models.ContentEditing @@ -8,7 +9,7 @@ namespace Umbraco.Web.Models.ContentEditing /// Represents the data used to invite a user /// [DataContract(Name = "user", Namespace = "")] - public class UserInvite : EntityBasic + public class UserInvite : EntityBasic, IValidatableObject { [DataMember(Name = "userGroups")] [Required] @@ -21,6 +22,11 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "message")] public string Message { get; set; } - + + public IEnumerable Validate(ValidationContext validationContext) + { + if (UserGroups.Any() == false) + yield return new ValidationResult("A user must be assigned to at least one group", new[] { "UserGroups" }); + } } } \ No newline at end of file diff --git a/src/Umbraco.Web/Models/ContentEditing/UserSave.cs b/src/Umbraco.Web/Models/ContentEditing/UserSave.cs index 30f6bfc420..1b6a76ae99 100644 --- a/src/Umbraco.Web/Models/ContentEditing/UserSave.cs +++ b/src/Umbraco.Web/Models/ContentEditing/UserSave.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.Linq; using System.Runtime.Serialization; namespace Umbraco.Web.Models.ContentEditing @@ -47,11 +48,8 @@ namespace Umbraco.Web.Models.ContentEditing public IEnumerable Validate(ValidationContext validationContext) { - //TODO: Add other server side validation - //if (CultureInfo.GetCultureInfo(Culture)) - // yield return new ValidationResult("The culture is invalid", new[] { "Culture" }); - - yield break; + if (UserGroups.Any() == false) + yield return new ValidationResult("A user must be assigned to at least one group", new[] { "UserGroups" }); } } } \ No newline at end of file