Browse Source

Small fixes.

pull/430/head
Sebastian Stehle 6 years ago
parent
commit
b4a07a856f
  1. 4
      src/Squidex/app/features/content/shared/content-status.component.html
  2. 22
      src/Squidex/app/shared/components/references-dropdown.component.ts
  3. 6
      src/Squidex/app/shared/components/search-form.component.ts

4
src/Squidex/app/features/content/shared/content-status.component.html

@ -1,11 +1,11 @@
<ng-container *ngIf="scheduledTo; else noSchedule">
<span class="content-status pending mr-1"title="{{tooltipText}}" titlePosition="top">
<span class="content-status pending mr-1"title="{{tooltipText}}">
<i class="icon-clock" [class.icon-sm]="small"></i>
</span>
</ng-container>
<ng-template #noSchedule>
<span class="content-status default mr-1" [style.color]="statusColor" title="{{tooltipText}}" titlePosition="top">
<span class="content-status default mr-1" [style.color]="statusColor" title="{{tooltipText}}">
<i class="icon-circle" [class.icon-sm]="small"></i>
</span>
</ng-template>

22
src/Squidex/app/shared/components/references-dropdown.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
*/
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnInit } from '@angular/core';
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnChanges } from '@angular/core';
import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
import {
@ -48,7 +48,7 @@ const NO_EMIT = { emitEvent: false };
providers: [SQX_REFERENCES_DROPDOWN_CONTROL_VALUE_ACCESSOR],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class ReferencesDropdownComponent extends StatefulControlComponent<State, ReadonlyArray<string> | string> implements OnInit {
export class ReferencesDropdownComponent extends StatefulControlComponent<State, ReadonlyArray<string> | string> implements OnChanges {
private languageField: LanguageDto;
private selectedId: string | undefined;
private itemCount: number;
@ -59,6 +59,10 @@ export class ReferencesDropdownComponent extends StatefulControlComponent<State,
@Input()
public mode: 'Array' | 'Single';
public get isValid() {
return !!this.schemaId && !!this.languageField;
}
@Input()
public set language(value: LanguageDto) {
this.languageField = value;
@ -102,8 +106,8 @@ export class ReferencesDropdownComponent extends StatefulControlComponent<State,
}));
}
public ngOnInit() {
if (!this.schemaId || this.language) {
public ngOnChanges() {
if (!this.isValid) {
this.selectionControl.disable();
return;
}
@ -121,6 +125,16 @@ export class ReferencesDropdownComponent extends StatefulControlComponent<State,
});
}
public setDisabledState(isDisabled: boolean) {
if (isDisabled) {
this.selectionControl.disable();
} else if (this.isValid) {
this.selectionControl.enable();
}
super.setDisabledState(isDisabled);
}
public writeValue(obj: any) {
if (Types.isString(obj)) {
this.selectedId = obj;

6
src/Squidex/app/shared/components/search-form.component.ts

@ -72,9 +72,15 @@ export class SearchFormComponent implements OnChanges {
public ngOnChanges(changes: SimpleChanges) {
if (changes['query'] || changes['queries']) {
this.updateSaveKey();
}
if (changes['query']) {
this.hasFilter = hasFilter(this.query);
}
if (changes['queryModel']) {
this.query = {};
}
}
public search(close = false) {

Loading…
Cancel
Save