From eea3a573cccd70a1ac7b6e930149637604348713 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Fri, 7 Sep 2018 15:15:30 +0300 Subject: [PATCH 1/4] Added paging to user list. --- .../src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js index a13dfb5220..2ed43afa74 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js @@ -13,6 +13,9 @@ var _$table = _$wrapper.find('table'); var _dataTable = _$table.DataTable(abp.libs.datatables.normalizeConfiguration({ order: [[1, "asc"]], + processing: true, + serverSide: true, + paging: true, ajax: abp.libs.datatables.createAjax(_identityUserAppService.getList), columnDefs: [ { From d2b2af5c446fb311e284ab4fe5620d99f29dc1c5 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 10 Sep 2018 11:36:18 +0300 Subject: [PATCH 2/4] blogging module delete comment confirm --- .../Pages/Blog/Posts/detail.js | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/detail.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/detail.js index 9a15b035bc..6f327b522c 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/detail.js +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/detail.js @@ -25,9 +25,9 @@ $('a').click(function (event) { var linkElement = $(this); - var data = linkElement.attr('data-relpyid'); + var replyCommentId = linkElement.attr('data-relpyid'); - if (data != '' && data !== undefined) { + if (replyCommentId != '' && replyCommentId !== undefined) { event.preventDefault(); @@ -42,25 +42,35 @@ return; } - data = $(this).attr('data-deleteid'); + var deleteCommentId = $(this).attr('data-deleteid'); - if (data != '' && data !== undefined) { + if (deleteCommentId != '' && deleteCommentId !== undefined) { + console.log(deleteCommentId); event.preventDefault(); - - $.ajax({ - type: "POST", - url: "/Blog/Comments/Delete", - data: { id: data }, - success: function (response) { - linkElement.parent().parent().parent().remove(); + abp.message.confirm( + 'User admin will be deleted.', + 'Are you sure?', + function (isConfirmed) { + console.log(deleteCommentId); + if (isConfirmed) { + $.ajax({ + type: "POST", + url: "/Blog/Comments/Delete", + data: { id: deleteCommentId }, + success: function (response) { + linkElement.parent().parent().parent().remove(); + } + }); + } } - }); + ); + } - data = $(this).attr('data-updateid'); + var updateCommentId = $(this).attr('data-updateid'); - if (data != '' && data !== undefined) { + if (updateCommentId != '' && updateCommentId !== undefined) { event.preventDefault(); From d9f52b15282c1b4121b2347e882cb37be823135f Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 10 Sep 2018 11:45:44 +0300 Subject: [PATCH 3/4] https://github.com/abpframework/abp/issues/408 --- .../BloggingTestAppEntityFrameworkCoreModule.cs | 5 +---- .../app/Volo.BloggingTestApp/BloggingTestAppModule.cs | 2 -- .../Volo/Blogging/BloggingApplicationContractsModule.cs | 2 -- .../Volo/Blogging/BloggingApplicationModule.cs | 2 -- .../Volo/Blogging/BloggingDomainSharedModule.cs | 2 -- .../Volo/Blogging/BloggingDomainModule.cs | 5 +---- .../EntityFrameworkCore/BloggingEntityFrameworkCoreModule.cs | 2 -- .../Volo/Blogging/BloggingHttpApiClientModule.cs | 5 +---- .../Volo/Blogging/BloggingHttpApiModule.cs | 5 +---- modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs | 2 -- .../Volo/Blogging/BloggingApplicationTestModule.cs | 2 -- .../BloggingEntityFrameworkCoreTestModule.cs | 2 -- .../Volo/Blogging/BloggingTestBaseModule.cs | 4 ---- 13 files changed, 4 insertions(+), 36 deletions(-) diff --git a/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/BloggingTestAppEntityFrameworkCoreModule.cs b/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/BloggingTestAppEntityFrameworkCoreModule.cs index b1102c6d83..fd8ff13b2a 100644 --- a/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/BloggingTestAppEntityFrameworkCoreModule.cs +++ b/modules/blogging/app/Volo.BloggingTestApp.EntityFrameworkCore/BloggingTestAppEntityFrameworkCoreModule.cs @@ -16,9 +16,6 @@ namespace Volo.BloggingTestApp.EntityFrameworkCore typeof(AbpEntityFrameworkCoreSqlServerModule))] public class BloggingTestAppEntityFrameworkCoreModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAssemblyOf(); - } + } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs index b29b4d11c1..0b5482a0ea 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs @@ -92,8 +92,6 @@ namespace Volo.BloggingTestApp { options.DefaultThemeName = BasicTheme.Name; }); - - context.Services.AddAssemblyOf(); } public override void OnApplicationInitialization(ApplicationInitializationContext context) diff --git a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingApplicationContractsModule.cs b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingApplicationContractsModule.cs index b9c139fae0..c3a7782fe8 100644 --- a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingApplicationContractsModule.cs +++ b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingApplicationContractsModule.cs @@ -13,8 +13,6 @@ namespace Volo.Blogging { options.DefinitionProviders.Add(); }); - - context.Services.AddAssemblyOf(); } } } diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/BloggingApplicationModule.cs b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/BloggingApplicationModule.cs index c075434b10..f063087028 100644 --- a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/BloggingApplicationModule.cs +++ b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/BloggingApplicationModule.cs @@ -18,8 +18,6 @@ namespace Volo.Blogging { options.AddProfile(validate: true); }); - - context.Services.AddAssemblyOf(); } } } diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs index 9f066a448d..5061ce3b59 100644 --- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs +++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs @@ -14,8 +14,6 @@ namespace Volo.Blogging { options.Resources.Add("en"); }); - - context.Services.AddAssemblyOf(); } } } diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs index 11d5419f27..6c73a7e71a 100644 --- a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs +++ b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs @@ -9,9 +9,6 @@ namespace Volo.Blogging typeof(AbpDddDomainModule))] public class BloggingDomainModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAssemblyOf(); - } + } } diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingEntityFrameworkCoreModule.cs b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingEntityFrameworkCoreModule.cs index c7b53a1a75..6e46982e44 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingEntityFrameworkCoreModule.cs +++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingEntityFrameworkCoreModule.cs @@ -12,8 +12,6 @@ namespace Volo.Blogging.EntityFrameworkCore public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddAbpDbContext(); - - context.Services.AddAssemblyOf(); } } } diff --git a/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo/Blogging/BloggingHttpApiClientModule.cs b/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo/Blogging/BloggingHttpApiClientModule.cs index dcbc9d8df6..e82b038c8e 100644 --- a/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo/Blogging/BloggingHttpApiClientModule.cs +++ b/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo/Blogging/BloggingHttpApiClientModule.cs @@ -7,9 +7,6 @@ namespace Volo.Blogging typeof(BloggingApplicationContractsModule))] public class BloggingHttpApiClientModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAssemblyOf(); - } + } } diff --git a/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BloggingHttpApiModule.cs b/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BloggingHttpApiModule.cs index e2a58d2940..56c657ba6b 100644 --- a/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BloggingHttpApiModule.cs +++ b/modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BloggingHttpApiModule.cs @@ -7,9 +7,6 @@ namespace Volo.Blogging typeof(BloggingApplicationContractsModule))] public class BloggingHttpApiModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAssemblyOf(); - } + } } diff --git a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs index 9ec9c04d94..87777203d6 100644 --- a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs +++ b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs @@ -62,8 +62,6 @@ namespace Volo.Blogging options.Conventions.AddPageRoute("/Blog/Posts/Edit", "blog/{blogShortName}/posts/edit/{postId}"); options.Conventions.AddPageRoute("/Blog/Posts/New", "blog/{blogShortName}/posts/new"); }); - - context.Services.AddAssemblyOf(); } } } diff --git a/modules/blogging/test/Volo.Blogging.Application.Tests/Volo/Blogging/BloggingApplicationTestModule.cs b/modules/blogging/test/Volo.Blogging.Application.Tests/Volo/Blogging/BloggingApplicationTestModule.cs index 61acc2e378..ab2cbd12dd 100644 --- a/modules/blogging/test/Volo.Blogging.Application.Tests/Volo/Blogging/BloggingApplicationTestModule.cs +++ b/modules/blogging/test/Volo.Blogging.Application.Tests/Volo/Blogging/BloggingApplicationTestModule.cs @@ -13,8 +13,6 @@ namespace Volo.Blogging public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddAlwaysAllowAuthorization(); - - context.Services.AddAssemblyOf(); } } } diff --git a/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo/Blogging/EntityFrameworkCore/BloggingEntityFrameworkCoreTestModule.cs b/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo/Blogging/EntityFrameworkCore/BloggingEntityFrameworkCoreTestModule.cs index 68bf574580..ef8986bfc6 100644 --- a/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo/Blogging/EntityFrameworkCore/BloggingEntityFrameworkCoreTestModule.cs +++ b/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo/Blogging/EntityFrameworkCore/BloggingEntityFrameworkCoreTestModule.cs @@ -28,8 +28,6 @@ namespace Volo.Blogging.EntityFrameworkCore abpDbContextConfigurationContext.DbContextOptions.UseSqlite(_sqliteConnection); }); }); - - context.Services.AddAssemblyOf(); } private static SqliteConnection CreateDatabaseAndGetConnection() diff --git a/modules/blogging/test/Volo.Blogging.TestBase/Volo/Blogging/BloggingTestBaseModule.cs b/modules/blogging/test/Volo.Blogging.TestBase/Volo/Blogging/BloggingTestBaseModule.cs index 28539f255d..e957851493 100644 --- a/modules/blogging/test/Volo.Blogging.TestBase/Volo/Blogging/BloggingTestBaseModule.cs +++ b/modules/blogging/test/Volo.Blogging.TestBase/Volo/Blogging/BloggingTestBaseModule.cs @@ -12,10 +12,6 @@ namespace Volo.Blogging )] public class BloggingTestBaseModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAssemblyOf(); - } public override void OnApplicationInitialization(ApplicationInitializationContext context) { From 82c203bc01b82dedc81eac73f0598a756ca17281 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 10 Sep 2018 13:31:23 +0300 Subject: [PATCH 4/4] blog module detail.js refactor --- .../Pages/Blog/Posts/Detail.cshtml | 6 ++-- .../Pages/Blog/Posts/detail.js | 35 +++++++++---------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml index df1a9e7a53..5310a81eb8 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml @@ -129,13 +129,13 @@

- + @L["Reply"] @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Delete)) { | - + @L["Delete"] } @@ -143,7 +143,7 @@ @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Update) || (CurrentUser.Id == commentWithRepliesDto.Comment.CreatorId)) { | - + @L["Edit"] } diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/detail.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/detail.js index 6f327b522c..c6f7e0004f 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/detail.js +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/detail.js @@ -6,7 +6,7 @@ $('form[class="editFormClass"]').submit(function (event) { event.preventDefault(); var form = $(this).serializeFormToObject(); - + $.ajax({ type: "POST", url: "/Blog/Comments/Update", @@ -23,15 +23,13 @@ }); }); - $('a').click(function (event) { + $('.replyLink').click(function (event) { + event.preventDefault(); var linkElement = $(this); var replyCommentId = linkElement.attr('data-relpyid'); if (replyCommentId != '' && replyCommentId !== undefined) { - - event.preventDefault(); - - var div = $(this).parent().next(); + var div = linkElement.parent().next(); if (div.is(":hidden")) { $('div .replyForm').hide(); @@ -41,18 +39,18 @@ } return; } + }); - var deleteCommentId = $(this).attr('data-deleteid'); + $('.deleteLink').click(function(event) { + event.preventDefault(); + var linkElement = $(this); + var deleteCommentId = linkElement.attr('data-deleteid'); if (deleteCommentId != '' && deleteCommentId !== undefined) { - - console.log(deleteCommentId); - event.preventDefault(); abp.message.confirm( - 'User admin will be deleted.', + 'Comment will be deleted.', // TODO: localize 'Are you sure?', - function (isConfirmed) { - console.log(deleteCommentId); + function(isConfirmed) { if (isConfirmed) { $.ajax({ type: "POST", @@ -65,16 +63,17 @@ } } ); - } + }); + $('.updateLink').click(function (event) { + event.preventDefault(); + var linkElement = $(this); var updateCommentId = $(this).attr('data-updateid'); if (updateCommentId != '' && updateCommentId !== undefined) { - event.preventDefault(); - - var div = $(this).parent().next().next(); + var div = linkElement.parent().next().next(); if (div.is(":hidden")) { $('div .editForm').hide(); @@ -84,8 +83,6 @@ } return; } - - }); })(jQuery);