Browse Source

Merge pull request #7053 from abpframework/cms-kit-improvements

CMS Kit - Global Filter Fix and Menu Localization
pull/7055/head
Ahmet Çotur 6 years ago
committed by GitHub
parent
commit
d6a6f3a619
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
  2. 1
      modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json
  3. 17
      modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs
  4. 21
      modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs

1
modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json

@ -8,6 +8,7 @@
"LoginToAddComment": "Login to add comment", "LoginToAddComment": "Login to add comment",
"LoginToRate": "Login to rate", "LoginToRate": "Login to rate",
"LoginToReply": "Login to reply", "LoginToReply": "Login to reply",
"Menu:CMS": "CMS",
"MessageDeletionConfirmationMessage": "This comment will be deleted completely.", "MessageDeletionConfirmationMessage": "This comment will be deleted completely.",
"Permission:CmsKit": "CmsKit", "Permission:CmsKit": "CmsKit",
"Permission:TagManagement": "Tag Management", "Permission:TagManagement": "Tag Management",

1
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", "LoginToAddComment": "Yorum yapmak için giriş yap",
"LoginToRate": "Oylamak için giriş yapın", "LoginToRate": "Oylamak için giriş yapın",
"LoginToReply": "Cevap vermek için giriş yap", "LoginToReply": "Cevap vermek için giriş yap",
"Menu:CMS": "CMS",
"MessageDeletionConfirmationMessage": "Bu yorum tamamen silinecektir", "MessageDeletionConfirmationMessage": "Bu yorum tamamen silinecektir",
"Permission:CmsKit": "CmsKit", "Permission:CmsKit": "CmsKit",
"Permission:TagManagement": "Etiket Yönetimi", "Permission:TagManagement": "Etiket Yönetimi",

17
modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs

@ -1,12 +1,28 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Volo.Abp.Data; using Volo.Abp.Data;
using Volo.Abp.EntityFrameworkCore; 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 namespace Volo.CmsKit.EntityFrameworkCore
{ {
[ConnectionStringName(CmsKitDbProperties.ConnectionStringName)] [ConnectionStringName(CmsKitDbProperties.ConnectionStringName)]
public class CmsKitDbContext : AbpDbContext<CmsKitDbContext>, ICmsKitDbContext 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) public CmsKitDbContext(DbContextOptions<CmsKitDbContext> options)
: base(options) : base(options)
{ {
@ -16,7 +32,6 @@ namespace Volo.CmsKit.EntityFrameworkCore
protected override void OnModelCreating(ModelBuilder builder) protected override void OnModelCreating(ModelBuilder builder)
{ {
base.OnModelCreating(builder); base.OnModelCreating(builder);
builder.ConfigureCmsKit(); builder.ConfigureCmsKit();
} }
} }

21
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.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 namespace Volo.CmsKit.EntityFrameworkCore
{ {
[ConnectionStringName(CmsKitDbProperties.ConnectionStringName)] [ConnectionStringName(CmsKitDbProperties.ConnectionStringName)]
public interface ICmsKitDbContext : IEfCoreDbContext 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; }
} }
} }
Loading…
Cancel
Save