Browse Source

Cloning and bugfix.

pull/320/head
Sebastian Stehle 8 years ago
parent
commit
ce620d9dc5
  1. 4
      src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs
  2. 3
      src/Squidex/app/features/content/pages/contents/contents-page.component.html
  3. 4
      src/Squidex/app/features/content/pages/contents/contents-page.component.ts
  4. 3
      src/Squidex/app/features/content/shared/content-item.component.html
  5. 3
      src/Squidex/app/features/content/shared/content-item.component.ts
  6. 1
      tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs

4
src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs

@ -13,8 +13,6 @@ using Microsoft.OData;
using Squidex.Domain.Apps.Core.Contents;
using Squidex.Domain.Apps.Core.ConvertContent;
using Squidex.Domain.Apps.Core.Scripting;
using Squidex.Domain.Apps.Core.Tags;
using Squidex.Domain.Apps.Entities.Assets.Queries;
using Squidex.Domain.Apps.Entities.Contents.Edm;
using Squidex.Domain.Apps.Entities.Contents.Repositories;
using Squidex.Domain.Apps.Entities.Schemas;
@ -30,7 +28,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
{
public sealed class ContentQueryService : IContentQueryService
{
private const int MaxResults = 20;
private const int MaxResults = 200;
private static readonly Status[] StatusAll = { Status.Archived, Status.Draft, Status.Published };
private static readonly Status[] StatusArchived = { Status.Archived };
private static readonly Status[] StatusPublished = { Status.Published };

3
src/Squidex/app/features/content/pages/contents/contents-page.component.html

@ -110,7 +110,8 @@
(publishing)="publish(content)"
(archiving)="archive(content)"
(restoring)="restore(content)"
(deleting)="delete(content)">
(deleting)="delete(content)"
(cloning)="clone(content)">
</tr>
<tr class="spacer"></tr>
</tbody>

4
src/Squidex/app/features/content/pages/contents/contents-page.component.ts

@ -139,6 +139,10 @@ export class ContentsPageComponent implements OnDestroy, OnInit {
this.changeContentItems(this.select(), 'Restore');
}
public clone(content: ContentDto) {
this.contentsState.create(content.dataDraft, false).pipe(onErrorResumeNext()).subscribe();
}
public isSelectedQuery(query: string) {
return query === this.contentsState.snapshot.contentsQuery || (!query && !this.contentsState.contentsQuery);
}

3
src/Squidex/app/features/content/shared/content-item.component.html

@ -99,6 +99,9 @@
<a class="dropdown-item" (click)="restoring.emit(); $event.stopPropagation()" *ngIf="content.status === 'Archived'">
Restore
</a>
<a class="dropdown-item" (click)="cloning.emit(); dropdown.hide(); $event.stopPropagation()" *ngIf="content.status !== 'Archived'">
Clone
</a>
<div class="dropdown-divider"></div>

3
src/Squidex/app/features/content/shared/content-item.component.ts

@ -32,6 +32,9 @@ import {
]
})
export class ContentItemComponent implements OnChanges {
@Output()
public cloning = new EventEmitter();
@Output()
public deleting = new EventEmitter();

1
tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs

@ -16,7 +16,6 @@ using Squidex.Domain.Apps.Core.Apps;
using Squidex.Domain.Apps.Core.Contents;
using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Domain.Apps.Core.Scripting;
using Squidex.Domain.Apps.Core.Tags;
using Squidex.Domain.Apps.Entities.Apps;
using Squidex.Domain.Apps.Entities.Contents.Edm;
using Squidex.Domain.Apps.Entities.Contents.Repositories;

Loading…
Cancel
Save