Revert "Request expects JSON"

yajra · web-flow · commit dd1645d48b18 · 2021-01-13T16:03:58.000+08:00
diff --git a/src/Services/DataTable.php b/src/Services/DataTable.php
@@ -154,7 +154,7 @@ abstract class DataTable implements DataTableButtons
      */
     public function render($view, $data = [], $mergeData = [])
     {
-        if ($this->request()->expectsJson()) {
+        if ($this->request()->ajax() && $this->request()->wantsJson()) {
             return app()->call([$this, 'ajax']);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ abstract class DataTable implements DataTableButtons`
`154`	`154`	`*/`
`155`	`155`	`public function render($view, $data = [], $mergeData = [])`
`156`	`156`	`{`
`157`		`- if ($this->request()->expectsJson()) {`
	`157`	`+ if ($this->request()->ajax() && $this->request()->wantsJson()) {`
`158`	`158`	`return app()->call([$this, 'ajax']);`
`159`	`159`	`}`
`160`	`160`