From fdb5bbadd0527fb341cb7cbd2b280ab216c7abbe Mon Sep 17 00:00:00 2001
From: Ilkay Ilknur <ilkay@ilkayilknur.com>
Date: Wed, 6 Jan 2021 12:47:02 +0300
Subject: [PATCH 1/2] missing dbsets added.

Resolves global filter issues.
---
 .../EntityFrameworkCore/CmsKitDbContext.cs    | 17 ++++++++++++++-
 .../EntityFrameworkCore/ICmsKitDbContext.cs   | 21 ++++++++++++++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs
index 65d9b55181..0a4213e1b4 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs
@@ -1,12 +1,28 @@
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
+using Volo.CmsKit.Comments;
+using Volo.CmsKit.Contents;
+using Volo.CmsKit.Pages;
+using Volo.CmsKit.Ratings;
+using Volo.CmsKit.Reactions;
+using Volo.CmsKit.Tags;
+using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.EntityFrameworkCore
 {
     [ConnectionStringName(CmsKitDbProperties.ConnectionStringName)]
     public class CmsKitDbContext : AbpDbContext<CmsKitDbContext>, ICmsKitDbContext
     {
+        public DbSet<Content> Contents { get; set; }
+        public DbSet<Comment> Comments { get; set; }
+        public DbSet<CmsUser> User { get; set; }
+        public DbSet<UserReaction> Reactions { get; set; }
+        public DbSet<Rating> Ratings { get; set; }
+        public DbSet<Tag> Tags { get; set; }
+        public DbSet<EntityTag> EntityTags { get; set; }
+        public DbSet<Page> Pages { get; set; }
+        
         public CmsKitDbContext(DbContextOptions<CmsKitDbContext> options)
             : base(options)
         {
@@ -16,7 +32,6 @@ namespace Volo.CmsKit.EntityFrameworkCore
         protected override void OnModelCreating(ModelBuilder builder)
         {
             base.OnModelCreating(builder);
-
             builder.ConfigureCmsKit();
         }
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs
index 80bfeb1f5a..a5981fd000 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs
@@ -1,11 +1,26 @@
-using Volo.Abp.Data;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
+using Volo.CmsKit.Comments;
+using Volo.CmsKit.Contents;
+using Volo.CmsKit.Pages;
+using Volo.CmsKit.Ratings;
+using Volo.CmsKit.Reactions;
+using Volo.CmsKit.Tags;
+using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.EntityFrameworkCore
 {
     [ConnectionStringName(CmsKitDbProperties.ConnectionStringName)]
     public interface ICmsKitDbContext : IEfCoreDbContext
     {
-
+        DbSet<Content> Contents { get; set; }
+        DbSet<Comment> Comments { get; set; }
+        DbSet<CmsUser> User { get; set; }
+        DbSet<UserReaction> Reactions { get; set; }
+        DbSet<Rating> Ratings { get; set; }
+        DbSet<Tag> Tags { get; set; }
+        DbSet<EntityTag> EntityTags { get; set; }
+        DbSet<Page> Pages { get; set; }
     }
-}
+}
\ No newline at end of file

From 9f67b5ddb1a7ddca36712406ec1adcf74328ae80 Mon Sep 17 00:00:00 2001
From: Ilkay Ilknur <ilkay@ilkayilknur.com>
Date: Wed, 6 Jan 2021 12:47:17 +0300
Subject: [PATCH 2/2] CMS Menu localization key added.

---
 .../Volo/CmsKit/Localization/Resources/en.json                   | 1 +
 .../Volo/CmsKit/Localization/Resources/tr.json                   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
index 42d56b8d16..27c5b3fad0 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
@@ -8,6 +8,7 @@
     "LoginToAddComment": "Login to add comment",
     "LoginToRate": "Login to rate",
     "LoginToReply": "Login to reply",
+    "Menu:CMS": "CMS",
     "MessageDeletionConfirmationMessage": "This comment will be deleted completely.",
     "Permission:CmsKit": "CmsKit",
     "Permission:TagManagement": "Tag Management",
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json
index ac8bd98a9f..2433aca4ac 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json
@@ -8,6 +8,7 @@
     "LoginToAddComment": "Yorum yapmak için giriş yap",
     "LoginToRate": "Oylamak için giriş yapın",
     "LoginToReply": "Cevap vermek için giriş yap",
+    "Menu:CMS": "CMS",
     "MessageDeletionConfirmationMessage": "Bu yorum tamamen silinecektir",
     "Permission:CmsKit": "CmsKit",
     "Permission:TagManagement": "Etiket Yönetimi",