Skip to content

Fixed a bug with the storage key saving for hidden columns and per page #604

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

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fixed a bug with the storage key saving for hidden columns and per page #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
97a9a38
Update LivewireDatatables to support DB::raw with laravel version 10.
Nowocyn Sep 1, 2023
79dea96
Update style
Nowocyn Sep 1, 2023
c138df8
Switch to correct function.
Nowocyn Sep 1, 2023
e262b9f
Switch to correct function.
Nowocyn Sep 1, 2023
8e3041a
Fix style.
Nowocyn Sep 1, 2023
5503eef
Update x-datatables.x-circle to x-icon
Nowocyn Sep 5, 2023
e72ee8a
Update x-datatables.x-circle to x-icon
Nowocyn Sep 5, 2023
903c0ec
Merge branch 'MedicOneSystems:master' into master
Nowocyn Oct 26, 2023
4f113ef
Fixed wrong naming of the session key _hidden_columns.
Nowocyn Oct 26, 2023
781d3a7
Fixing an other wrongly saved session key _per_page
Nowocyn Oct 26, 2023
9915c1b
Update composer.json
Nowocyn Aug 12, 2024
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"php": "^8.0",
"illuminate/support": "^7.0|^8.0|^9.0|^10.0",
"livewire/livewire": "^2.4.4",
"maatwebsite/excel": "^3.1",

"reedware/laravel-relation-joins": "^2.4|^3.0|^4.0"
},
"require-dev": {
Expand Down
4 changes: 2 additions & 2 deletions src/Http/Livewire/LivewireDatatable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ public function getSessionStoredPerPage()
return;
}

$this->perPage = session()->get($this->sessionStorageKey() . $this->name . '_perpage', $this->perPage);
$this->perPage = session()->get($this->sessionStorageKey() . '_perpage', $this->perPage);
}

public function setSessionStoredSort()
Expand Down Expand Up @@ -554,7 +554,7 @@ public function setSessionStoredHidden()

$hidden = collect($this->columns)->filter->hidden->keys()->toArray();

session()->put([$this->sessionStorageKey() . $this->name . '_hidden_columns' => $hidden]);
session()->put([$this->sessionStorageKey() . '_hidden_columns' => $hidden]);
}

public function initialiseSearch()
Expand Down