Merge remote-tracking branch 'origin/f-get-query-object' into nette-3

Viktor Masicek · Viktor Masicek · commit b556ff491f92 · 2020-01-13T13:47:00.000+01:00
# Conflicts:
#	src/QueryObjectDataSource.php
diff --git a/src/QueryObjectDataSource.php b/src/QueryObjectDataSource.php
@@ -247,4 +247,8 @@ public static function parseFilterDate(FilterDate $filter) {
 		}
 	}
 
+	public function getQueryObject() {
+		return $this->queryObject;
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -247,4 +247,8 @@ public static function parseFilterDate(FilterDate $filter) {`
`247`	`247`	`}`
`248`	`248`	`}`
`249`	`249`
	`250`	`+ public function getQueryObject() {`
	`251`	`+ return $this->queryObject;`
	`252`	`+ }`
	`253`	`+`
`250`	`254`	`}`