Commit 6557064

authored

Merge pull request #197 from Seb33300/fix-ajax-action

fix: custom ajax action

2 parents 8f388e3 + 999ad17 commit 6557064Copy full SHA for 6557064

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -172,10 +172,6 @@ public function __construct()`
`172`	`172`	`*/`
`173`	`173`	`public function render(?string $view = null, array $data = [], array $mergeData = [])`
`174`	`174`	`{`
`175`		`- if ($this->request()->ajax() && $this->request()->wantsJson()) {`
`176`		`- return app()->call($this->ajax(...));`
`177`		`- }`
`178`		`-`
`179`	`175`	`/** @var string $action */`
`180`	`176`	`$action = $this->request()->get('action');`
`181`	`177`	`$actionMethod = $action === 'print' ? 'printPreview' : $action;`
`@@ -187,6 +183,10 @@ public function render(?string $view = null, array $data = [], array $mergeData`
`187`	`183`	`return app()->call($callback);`
`188`	`184`	`}`
`189`	`185`
	`186`	`+ if ($this->request()->ajax() && $this->request()->wantsJson()) {`
	`187`	`+ return app()->call($this->ajax(...));`
	`188`	`+ }`
	`189`	`+`
`190`	`190`	`/** @phpstan-ignore-next-line */`
`191`	`191`	`return view($view, $data, $mergeData)->with($this->dataTableVariable, $this->getHtmlBuilder());`
`192`	`192`	`}`

Comments

(0)