Merge pull request #7942 from abpframework/cms-kit/general-refactor

Cms Kit - General Refactor
abpframework · Mar 4, 2021 · d15e3c3 · d15e3c3
2 parents f978661 + 0b17b2f
commit d15e3c3
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/....Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs b/....Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs
@@ -52,9 +52,9 @@ public override void Define(IPermissionDefinitionContext context)
                 blogManagement.AddChild(CmsKitAdminPermissions.Blogs.Features, L("Permission:BlogManagement.Features"));
 
                 var blogPostManagement = cmsGroup.AddPermission(CmsKitAdminPermissions.BlogPosts.Default, L("Permission:BlogPostManagement"));
-                blogManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Create, L("Permission:BlogPostManagement.Create"));
-                blogManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Update, L("Permission:BlogPostManagement.Update"));
-                blogManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Delete, L("Permission:BlogPostManagement.Delete"));
+                blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Create, L("Permission:BlogPostManagement.Create"));
+                blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Update, L("Permission:BlogPostManagement.Update"));
+                blogPostManagement.AddChild(CmsKitAdminPermissions.BlogPosts.Delete, L("Permission:BlogPostManagement.Delete"));
             }
         }
 

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
@@ -82,7 +82,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                 options.Conventions.AddPageRoute("/CmsKit/BlogPosts/Create", "/Cms/BlogPosts/Create");
                 options.Conventions.AddPageRoute("/CmsKit/BlogPosts/Update", "/Cms/BlogPosts/Update/{Id}");
                 options.Conventions.AddPageRoute("/CmsKit/Comments/Index", "/Cms/Comments");
-                options.Conventions.AddPageRoute("/CmsKit/Comments/Details", "/Cms/Details");
+                options.Conventions.AddPageRoute("/CmsKit/Comments/Details", "/Cms/Comments/{Id}");
             });
 
             Configure<AbpPageToolbarOptions>(options =>

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js
@@ -8,7 +8,7 @@
     var $shortDescription = $('#ViewModel_ShortDescription');
     var $url = $('#ViewModel_Slug');
     var $buttonSubmit = $('#button-blog-post-create');
-    var $pageContentInput = $('#ViewModel_Value');
+    var $pageContentInput = $('#ViewModel_Content');
     var $tagsInput = $('.tag-editor-form input[name=tags]');
     var $fileInput = $('#BlogPostCoverImage');
     var $tagsWrapper = $('#blog-post-tags-wrapper');

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
@@ -60,7 +60,7 @@
                         {
                             text: l('Details'),
                             action: function (data) {
-                                window.location = abp.appPath + 'CmsKit/Comments/Details/' + data.record.id;
+                                location.href = 'Comments/' + data.record.id;
                             }
                         },
                         {

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js
@@ -19,7 +19,7 @@
                 success: function (result) {
                     abp.notify.success(l('SuccessfullySaved'));
                     abp.ui.clearBusy();
-                    location.href = "/CmsKit/Pages/";
+                    location.href = "../Pages";
                 }
             });
         }

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js
@@ -30,7 +30,7 @@
                             text: l('Edit'),
                             visible: abp.auth.isGranted('CmsKit.Pages.Update'),
                             action: function (data) {
-                                location.href = '/CmsKit/Pages/Update/' + data.record.id;
+                                location.href = 'Pages/Update/' + data.record.id;
                             }
                         },
                         {
@@ -76,6 +76,6 @@
 
     $('#AbpContentToolbar button[name=CreatePage]').on('click', function (e) {
         e.preventDefault();
-        window.location.href = "/CmsKit/Pages/Create"
+        window.location.href = "Pages/Create"
     });
 });
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js
@@ -18,7 +18,7 @@
                 success: function (result) {
                     abp.notify.success(l('SuccessfullySaved'));
                     abp.ui.clearBusy();
-                    location.href = "/CmsKit/Pages/";
+                    location.href = "../../Pages";
                 }
             });
         }