Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix request sql options is overwritten by current class sql options #91

Merged
merged 3 commits into from
Dec 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.vscode
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ class MyClass
```

## Change Log

- 2.24.2 (24 Dec 2023)
- Fixed request sql options is overwritten by current class sql options
- 2.24.1 (24 Nov 2022)
- Fixed empty array of date in `date_response`.
- 2.24.0 (24 Nov 2022)
Expand Down
3 changes: 2 additions & 1 deletion src/Http/RestfulApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,8 @@ protected function listOptions(Request $request): array
$requestData['orderBy'] = [$request->sortBy, $request->sortDirection];
};

return array_merge($requestData, (array) $this->controllerInfo('listOptions'));
return array_merge((array) $this->controllerInfo('listOptions'), $requestData);
// return array_merge($requestData, (array) $this->controllerInfo('listOptions'));
}

/**
Expand Down