Browse Source

Guid parsing fixed and panel fixed.

pull/470/head
Sebastian 7 years ago
parent
commit
c8bc076ba2
  1. 11
      backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/AdaptionVisitor.cs
  2. 22
      frontend/app/framework/angular/panel.component.ts

11
backend/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/AdaptionVisitor.cs

@ -41,9 +41,16 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors
result = new CompareFilter<ClrValue>(path, nodeIn.Operator, nodeIn.Value);
}
if (path.Count == 1 && path[0] == "_id" && result.Value.Value is List<Guid> guidList)
if (path.Count == 1 && path[0] == "_id")
{
result = new CompareFilter<ClrValue>(path, nodeIn.Operator, guidList.Select(x => x.ToString()).ToList());
if (result.Value.Value is List<Guid> guidList)
{
result = new CompareFilter<ClrValue>(path, nodeIn.Operator, guidList.Select(x => x.ToString()).ToList());
}
else if (result.Value.Value is Guid guid)
{
result = new CompareFilter<ClrValue>(path, nodeIn.Operator, guid.ToString());
}
}
return result;

22
frontend/app/framework/angular/panel.component.ts

@ -25,14 +25,6 @@ export class PanelComponent implements AfterViewInit, OnChanges, OnDestroy, OnIn
private renderWidthField = 0;
private isViewInitField = false;
public get renderWidth() {
return this.renderWidthField;
}
public get isViewInit() {
return this.isViewInitField;
}
@Output()
public close = new EventEmitter();
@ -75,6 +67,12 @@ export class PanelComponent implements AfterViewInit, OnChanges, OnDestroy, OnIn
@Input()
public sidebarClass = '';
@Input()
public grid = false;
@Input()
public noPadding = false;
@ViewChild('panel', { static: false })
public panel: ElementRef<HTMLElement>;
@ -82,6 +80,14 @@ export class PanelComponent implements AfterViewInit, OnChanges, OnDestroy, OnIn
return this.close.observers.length > 0;
}
public get renderWidth() {
return this.renderWidthField;
}
public get isViewInit() {
return this.isViewInitField;
}
constructor(
private readonly container: PanelContainerDirective,
private readonly renderer: Renderer2

Loading…
Cancel
Save