Browse Source

Merge branch 'cms-kit/content-admin' of https://github.com/abpframework/abp into cms-kit/content-admin

pull/6926/head
enisn 6 years ago
parent
commit
7a6f5a42b5
  1. 5
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryAsyncExtensions.cs
  2. 3
      npm/ng-packs/packages/theme-shared/src/lib/components/sort-order-icon/sort-order-icon.component.ts

5
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryAsyncExtensions.cs

@ -12,13 +12,14 @@ namespace Volo.Abp.Domain.Repositories
{
#region Contains
public static Task<bool> ContainsAsync<T>(
public static async Task<bool> ContainsAsync<T>(
[NotNull] this IReadOnlyRepository<T> repository,
[NotNull] T item,
CancellationToken cancellationToken = default)
where T : class, IEntity
{
return repository.AsyncExecuter.ContainsAsync(repository, item, cancellationToken);
var queryable = await repository.GetQueryableAsync();
return await repository.AsyncExecuter.ContainsAsync(queryable, item, cancellationToken);
}
#endregion

3
npm/ng-packs/packages/theme-shared/src/lib/components/sort-order-icon/sort-order-icon.component.ts

@ -1,5 +1,8 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
/**
* @deprecated To be deleted in v5.0. Use ngx-datatale instead.
*/
@Component({
selector: 'abp-sort-order-icon',
templateUrl: './sort-order-icon.component.html',

Loading…
Cancel
Save