Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/trunk' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
mjansenDatabay committed Oct 28, 2024
2 parents cc80fc5 + 01d71d5 commit 1ddc296
Show file tree
Hide file tree
Showing 35 changed files with 10,190 additions and 14,062 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ public function applyViewControls(
$view_controls = $this->getViewControls($total_count);

if ($request = $this->getRequest()) {
$view_controls = $this->applyValuesToViewcontrols($view_controls, $request);
$data = $view_controls->getData();
# This retrieves container data from the request
$data = $this->applyValuesToViewcontrols($view_controls, $request)->getData();
$range = $data[self::VIEWCONTROL_KEY_PAGINATION];
$range = ($range instanceof Range) ? $range->croppedTo($total_count ?? PHP_INT_MAX) : null;
$order = $data[self::VIEWCONTROL_KEY_ORDERING];
Expand All @@ -136,6 +136,8 @@ public function applyViewControls(
->withRange($range)
->withOrder($order)
->withSelectedOptionalColumns($data[self::VIEWCONTROL_KEY_FIELDSELECTION] ?? null);
# This retrieves the view controls that should be displayed
$view_controls = $table->applyValuesToViewcontrols($table->getViewControls($total_count), $request);
}

return [
Expand Down
Loading

0 comments on commit 1ddc296

Please sign in to comment.