Skip to content

1.next cake4 #12

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 12, 2022
Merged

1.next cake4 #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d5939
new funcionality
Jul 12, 2022
9d2c1b8
fix initialitation
Jul 12, 2022
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
22 changes: 12 additions & 10 deletions src/View/Helper/DatatableHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,11 +461,12 @@ protected function validateConfigurationOptions()
*/
protected function processColumnTypeSearch()
{
$this->setTableTypeSearch($this->getConfig('searchHeadersType'));
if ($this->searchHeadersTypes === null) {
throw new MissConfiguredException(__('Search headers type not configured'));
if ($this->searchHeadersTypes === null || $this->searchHeadersTypes == []) {
$this->searchHeadersTypes = $this->getConfig('searchHeadersTypes');
}
if ($this->searchHeadersTypes === null || $this->searchHeadersTypes == []) {
$this->searchHeadersTypes = $this->fillDefaulTypes(count($this->dataKeys));
}

$rows = [];
foreach ($this->searchHeadersTypes as $definition) {
$parts = [];
Expand Down Expand Up @@ -649,12 +650,12 @@ public function getTableHeaders(
*/
public function setTableTypeSearch(?array $tableSearchHeaders = null): void
{
$defaultTypeSearch = $this->fillDefaulTypes(count($this->dataKeys));
if ($tableSearchHeaders === null) {
$this->searchHeadersTypes = $this->fillDefaulTypes(count($this->dataKeys));
} elseif (count($tableSearchHeaders) != count($this->dataKeys)) {
throw new MissConfiguredException(
__('Number of columns in search headers must be equal to number of columns in searchable columns')
);
$this->searchHeadersTypes = $defaultTypeSearch;
} elseif (count($tableSearchHeaders) !== count($this->dataKeys)) {
$this->searchHeadersTypes = $tableSearchHeaders + $defaultTypeSearch;
ksort($this->searchHeadersTypes);
} else {
$this->searchHeadersTypes = $tableSearchHeaders;
}
Expand All @@ -676,12 +677,13 @@ public function getSearchHedadersTypes()
* @param int $count Number of columns in searchable columns
* @return array
*/
private function fillDefaulTypes(int $count): array
protected function fillDefaulTypes(int $count): array
{
$searchTypes = [];
for ($i = 0; $i < $count; $i++) {
$searchTypes[] = ['type' => 'input', 'data' => []];
}

return $searchTypes;
}
}