Browse Source

Merge branch 'master' of https://github.com/volosoft/abp

pull/395/head
Halil ibrahim Kalkan 8 years ago
parent
commit
a1b85035f6
  1. 2
      modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/AbpAuditLoggingEfCoreQueryableExtensions.cs
  2. 5
      modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantConnectionString.cs

2
modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/AbpAuditLoggingEfCoreQueryableExtensions.cs

@ -19,7 +19,7 @@ namespace Volo.Abp.AuditLogging
return queryable return queryable
.Include(x => x.Actions) .Include(x => x.Actions)
.Include(x => x.EntityChanges); .Include(x => x.EntityChanges).ThenInclude(ec=>ec.PropertyChanges);
} }
} }

5
modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantConnectionString.cs

@ -26,5 +26,10 @@ namespace Volo.Abp.TenantManagement
Name = name; Name = name;
Value = value; Value = value;
} }
public override object[] GetKeys()
{
return new object[] { TenantId, Name, Value };
}
} }
} }
Loading…
Cancel
Save