Compare commits
2 Commits
68fa1b8c2d
...
9f57182fc1
Author | SHA1 | Date | |
---|---|---|---|
9f57182fc1 | |||
699377be54 |
@ -182,10 +182,10 @@ class QueryABC(ObjectType):
|
|||||||
if filter is not None:
|
if filter is not None:
|
||||||
collection = filter.filter(collection)
|
collection = filter.filter(collection)
|
||||||
|
|
||||||
if page is not None:
|
|
||||||
collection = page.filter(collection)
|
|
||||||
|
|
||||||
if sort is not None:
|
if sort is not None:
|
||||||
collection = sort.filter(collection)
|
collection = sort.filter(collection)
|
||||||
|
|
||||||
|
if page is not None:
|
||||||
|
collection = page.filter(collection)
|
||||||
|
|
||||||
return collection
|
return collection
|
||||||
|
@ -11,15 +11,15 @@ export class HistoryBtnComponent implements OnInit {
|
|||||||
@Input() history: History[] = [];
|
@Input() history: History[] = [];
|
||||||
@Input() translationKey: string = "";
|
@Input() translationKey: string = "";
|
||||||
|
|
||||||
showSidebar = false;
|
public showSidebar: boolean = false;
|
||||||
|
|
||||||
constructor() {
|
public constructor() {
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit(): void {
|
public ngOnInit(): void {
|
||||||
}
|
}
|
||||||
|
|
||||||
openHistory(): void {
|
public openHistory(): void {
|
||||||
this.showSidebar = true;
|
this.showSidebar = true;
|
||||||
let oldHistory: Partial<History> = {};
|
let oldHistory: Partial<History> = {};
|
||||||
for (const history of this.history) {
|
for (const history of this.history) {
|
||||||
@ -36,7 +36,7 @@ export class HistoryBtnComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
getAttributeTranslationKey(key: string) {
|
public getAttributeTranslationKey(key: string): string {
|
||||||
return `common.history.${key}`;
|
return `common.history.${key}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user