Skip to content

Commit 2fdbecb

Browse files
authored
Merge branch 'release/6.2.2' into NAE-1717
2 parents 61691c8 + 1f9764f commit 2fdbecb

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

projects/netgrif-components-core/src/assets/i18n/de.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@
9090
"defaultCaseName": "mit einem Standardfallnamen"
9191
},
9292
"user": {
93-
"assign": "Benützer zuweisen",
94-
"choose": "Benützer auswählen",
95-
"noUser": "Es gibt keine Benützer",
96-
"err": "Beim laden der Benützer ist eine Fehler aufgetreten",
97-
"showcase": "Benützeransichtmodus ist nicht ausgewählt!"
93+
"assign": "Benutzer zuweisen",
94+
"choose": "Benutzer auswählen",
95+
"noUser": "Es gibt keine Benutzer",
96+
"err": "Beim laden der Benutzer ist eine Fehler aufgetreten",
97+
"showcase": "Die Benutzeransicht ist nicht gesetzt!"
9898
},
9999
"ldapGroup": {
100100
"choose": "LDAP-Gruppe suchen",
@@ -288,8 +288,8 @@
288288
"enterEmail": "Ihre E-Mail Adresse eingeben"
289289
},
290290
"login": {
291-
"length": "Das Benützername muss mindestens 4 Zeichen enthalten",
292-
"login": "Benützername",
291+
"length": "Das Benutzername muss mindestens 4 Zeichen enthalten",
292+
"login": "Benutzername",
293293
"wrongCredentials": "Falsche Anmeldeinformationen!",
294294
"loginButton": "Anmelden",
295295
"reset": "Kennwort wiederherstellen",

projects/netgrif-components-core/src/lib/search/models/category/case/case-dataset.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,15 +257,18 @@ export class CaseDataset extends Category<Datafield> implements AutocompleteOpti
257257
case 'file':
258258
case 'fileList':
259259
return resolver.getIndex(datafield.fieldId, SearchIndex.FILE_NAME,
260-
this.isSelectedOperator(Equals) || this.isSelectedOperator(NotEquals) || this.isSelectedOperator(Substring));
260+
this.isSelectedOperator(Equals) || this.isSelectedOperator(NotEquals) || this.isSelectedOperator(Substring)
261+
|| this.isSelectedOperator(IsNull));
261262
case 'user':
262263
case 'userList':
263264
return resolver.getIndex(datafield.fieldId, SearchIndex.USER_ID);
264265
case 'i18n':
265-
return resolver.getIndex(datafield.fieldId, SearchIndex.TEXT, this.isSelectedOperator(Equals) || this.isSelectedOperator(NotEquals) || this.isSelectedOperator(Substring))
266+
return resolver.getIndex(datafield.fieldId, SearchIndex.TEXT, this.isSelectedOperator(Equals) || this.isSelectedOperator(NotEquals) || this.isSelectedOperator(Substring)
267+
|| this.isSelectedOperator(IsNull));
266268
default:
267269
return resolver.getIndex(datafield.fieldId, SearchIndex.FULLTEXT,
268-
this.isSelectedOperator(Equals) || this.isSelectedOperator(NotEquals) || this.isSelectedOperator(Substring));
270+
this.isSelectedOperator(Equals) || this.isSelectedOperator(NotEquals) || this.isSelectedOperator(Substring)
271+
|| this.isSelectedOperator(IsNull));
269272
}
270273
}
271274

projects/netgrif-components-core/src/lib/search/search-operand-input-component/abstract-search-operand-input.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export abstract class AbstractSearchOperandInputComponent implements OnInit, OnD
6262
return this._filteredOptions$;
6363
}
6464

65-
public get isInputFilled(): boolean {
65+
public isInputFilled(): boolean {
6666
if (!this._inputConfirmed) {
6767
return false;
6868
}
@@ -79,7 +79,7 @@ export abstract class AbstractSearchOperandInputComponent implements OnInit, OnD
7979
}
8080
this._initialExpansion = false;
8181

82-
if (!this.isInputFilled) {
82+
if (!this.isInputFilled()) {
8383
setTimeout(() => {
8484
input.nativeElement.focus();
8585
});

projects/netgrif-components/src/lib/data-fields/enumeration-field/enumeration-autocomplete-select-field/enumeration-autocomplete-select-field.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
[formControl]="formControlRef"
99
[matAutocomplete]="auto"
1010
[required]="enumerationField.behavior.required"
11+
(focus)="change()"
1112
(keyup)="change()">
1213
<mat-autocomplete [displayWith]="renderSelection" autoActiveFirstOption #auto="matAutocomplete">
1314
<mat-option [value]="null">---</mat-option>

projects/netgrif-components/src/lib/search/advanced-search/search-operand-input-component/search-operand-input.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div *ngIf="!isInputFilled; then operandSelection else operandDisplay"></div>
1+
<div *ngIf="!isInputFilled(); then operandSelection else operandDisplay"></div>
22

33
<ng-template #operandSelection>
44
<div [ngSwitch]="inputType">

0 commit comments

Comments
 (0)