From 031f9ef44bf51e99288932705ad7b72b95d2dbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?alir=C4=B1za=20ad=C4=B1yah=C5=9Fi?= Date: Wed, 11 Oct 2017 14:16:14 +0300 Subject: [PATCH] Edit user roles --- src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll | Bin 15360 -> 15872 bytes .../Abp/Identity/IIdentityUserAppService.cs | 2 + .../IdentityUserCreateOrUpdateOutput.cs | 2 +- .../Abp/Identity/IdentityUserAppService.cs | 5 +- .../Identity/Controllers/UsersController.cs | 4 +- .../Areas/Identity/Views/Users/_Create.cshtml | 61 +++++++++--------- .../Areas/Identity/Views/Users/_Update.cshtml | 58 +++++++++++++---- .../modules/identity/views/users/index.js | 39 +++++++---- .../Services/IAsyncCrudAppService.cs | 2 - 9 files changed, 113 insertions(+), 60 deletions(-) diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index b7cc055fbd1dab34af45b3dcaa3e4568c123b15d..9b260304f6fb90dcd88df8d7d4d0f83597b85d3b 100644 GIT binary patch delta 5342 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 diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs index c620ebd917..afe51f01ea 100644 --- a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs +++ b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs @@ -10,5 +10,7 @@ namespace Volo.Abp.Identity Task> GetRolesAsync(Guid id); Task UpdateRolesAsync(Guid id, IdentityUserUpdateRolesDto input); + + Task GetUserForCreateOrUpdateAsync(Guid? id); } } diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserCreateOrUpdateOutput.cs b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserCreateOrUpdateOutput.cs index e107db6b71..7a390bbc25 100644 --- a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserCreateOrUpdateOutput.cs +++ b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserCreateOrUpdateOutput.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.Identity { - public class IdentityUserCreateOrUpdateOutput: EntityDto + public class IdentityUserCreateOrUpdateOutput { public IdentityUserDto User { get; set; } diff --git a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs index 68b92a04c5..af2150a6cf 100644 --- a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs +++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs @@ -29,7 +29,7 @@ namespace Volo.Abp.Identity ); } - public async Task GetUserForCreateOrUpdateAsync(Guid id) + public async Task GetUserForCreateOrUpdateAsync(Guid? id) { var userRoleDtos = ObjectMapper.Map, IdentityUserRoleDto[]>(await _roleRepository.GetListAsync()); var output = new IdentityUserCreateOrUpdateOutput @@ -37,8 +37,9 @@ namespace Volo.Abp.Identity Roles = userRoleDtos }; - var user = await _userManager.GetByIdAsync(id); + if (!id.HasValue) return output; + var user = await _userManager.GetByIdAsync(id.Value); output.User = ObjectMapper.Map(user); foreach (var userRoleDto in userRoleDtos) diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Controllers/UsersController.cs b/src/Volo.Abp.Identity.Web/Areas/Identity/Controllers/UsersController.cs index 300395bf19..48ab86f57a 100644 --- a/src/Volo.Abp.Identity.Web/Areas/Identity/Controllers/UsersController.cs +++ b/src/Volo.Abp.Identity.Web/Areas/Identity/Controllers/UsersController.cs @@ -22,7 +22,9 @@ namespace Volo.Abp.Identity.Web.Areas.Identity.Controllers public async Task _Create() { - return PartialView(); + var identityUser = await _identityUserAppService.GetUserForCreateOrUpdateAsync(null); + + return PartialView(identityUser); } public async Task _Update(Guid id) diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Create.cshtml b/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Create.cshtml index 623fae0570..3df61db2ab 100644 --- a/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Create.cshtml +++ b/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Create.cshtml @@ -1,4 +1,4 @@ -@model Volo.Abp.Identity.IdentityUserDto +@model Volo.Abp.Identity.IdentityUserCreateOrUpdateOutput
@@ -7,21 +7,22 @@
+
+ + - - + +
+ +
- -
-
-
@@ -38,24 +39,24 @@
- -
-
- @foreach (var role in Model.Roles) - { -
- -
- } -
-
- +
+
+
+ @foreach (var role in Model.Roles) + { +
+ +
+ } +
+
+
+
diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Update.cshtml b/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Update.cshtml index 0f1b7fedc2..4ee931efc5 100644 --- a/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Update.cshtml +++ b/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Update.cshtml @@ -1,4 +1,4 @@ -@model Volo.Abp.Identity.IdentityUserDto +@model Volo.Abp.Identity.IdentityUserCreateOrUpdateOutput
@@ -8,19 +8,51 @@
- + + + + +
+ +
+ + + +
+ + +
+
+ + +
+
+ + +
+ +
+
+
+ @foreach (var role in Model.Roles) + { +
+ +
+ } +
+
-
- - -
-
- - -
-
- -
diff --git a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js index 393c59095c..af5ff7fa31 100644 --- a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js +++ b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js @@ -1,5 +1,5 @@ $(function () { - var identityUserAppService = volo.abp.identity.identityUser; + var _identityUserAppService = volo.abp.identity.identityUser; var dataTable = $('#IdentityUsersTable').DataTable({ processing: true, @@ -29,7 +29,7 @@ } if (callback) { - identityUserAppService.getList(inputFilter).done(function (result) { + _identityUserAppService.getList(inputFilter).done(function (result) { callback({ recordsTotal: result.totalCount, recordsFiltered: result.totalCount, @@ -85,7 +85,7 @@ var id = $(this).data('id'); if (confirm('Are you sure you want to delete?')) { - identityUserAppService.delete(id).done(function () { + _identityUserAppService.delete(id).done(function () { dataTable.ajax.reload(); }); } @@ -101,10 +101,11 @@ var $createUserForm = $('#createUserForm'); var user = $createUserForm.serializeFormToObject(); - identityUserAppService.create(user).done(function () { - $('#createUpdateUserModal').modal('hide'); - - dataTable.ajax.reload(); + _identityUserAppService.create(user).done(function (result) { + _identityUserAppService.updateRoles(result.id, { roleNames: findAssignedRoleNames() }).done(function () { + $('#createUpdateUserModal').modal('hide'); + dataTable.ajax.reload(); + }); }); }); @@ -112,14 +113,30 @@ var $updateUserForm = $('#updateUserForm'); var user = $updateUserForm.serializeFormToObject(); - identityUserAppService.update(user.Id, user).done(function () { - $('#createUpdateUserModal').modal('hide'); - - dataTable.ajax.reload(); + _identityUserAppService.update(user.Id, user).done(function (result) { + _identityUserAppService.updateRoles(result.id, { roleNames: findAssignedRoleNames() }).done(function () { + $('#createUpdateUserModal').modal('hide'); + dataTable.ajax.reload(); + }); }); }); }); + +function findAssignedRoleNames() { + var assignedRoleNames = []; + + $(document).find('.user-role-checkbox-list input[type=checkbox]') + .each(function () { + if ($(this).is(':checked')) { + assignedRoleNames.push($(this).attr('name')); + } + }); + + return assignedRoleNames; +} + +//TODO: move to common script file $.fn.serializeFormToObject = function () { //serialize to array var data = $(this).serializeArray(); diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/IAsyncCrudAppService.cs b/src/Volo.Abp/Volo/Abp/Application/Services/IAsyncCrudAppService.cs index 50f9314875..a94d0ce554 100644 --- a/src/Volo.Abp/Volo/Abp/Application/Services/IAsyncCrudAppService.cs +++ b/src/Volo.Abp/Volo/Abp/Application/Services/IAsyncCrudAppService.cs @@ -38,8 +38,6 @@ namespace Volo.Abp.Application.Services { Task GetAsync(TPrimaryKey id); - Task GetUserForCreateOrUpdateAsync(Guid id); - Task> GetListAsync(TGetListInput input); Task CreateAsync(TCreateInput input);