opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-09-24 15:42:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

update other places

Browse Source
This commit is contained in:
Dan Harrin
2025-09-16 20:44:16 +01:00
parent da22f7990c
commit 7f5d2b413c
4 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/forms/src/Components/CheckboxList.php
+7 -1
View File
@@ -149,7 +149,13 @@ class CheckboxList extends Field implements Contracts\CanDisableOptions, Contrac
$relationshipTitleAttribute = $component->getRelationshipTitleAttribute();
if (empty($relationshipQuery->getQuery()->orders)) {
$relationshipQuery->orderBy($relationshipQuery->qualifyColumn($relationshipTitleAttribute));
$relationshipOrderByAttribute = $relationshipTitleAttribute;
if (str_contains($relationshipOrderByAttribute, ' as ')) {
$relationshipOrderByAttribute = (string) str($relationshipOrderByAttribute)->before(' as ');
}
$relationshipQuery->orderBy($relationshipQuery->qualifyColumn($relationshipOrderByAttribute));
}
if (str_contains($relationshipTitleAttribute, '->')) {
packages/forms/src/Components/Select.php
+4 -4
View File
@@ -799,8 +799,8 @@ class Select extends Field implements Contracts\CanDisableOptions, Contracts\Has
if (empty($relationshipQuery->getQuery()->orders)) {
$relationshipOrderByAttribute = $relationshipTitleAttribute;
if (str_contains($relationshipTitleAttribute, ' as ')) {
$relationshipOrderByAttribute = substr($relationshipTitleAttribute, 0, strpos($relationshipTitleAttribute, ' as '));
if (str_contains($relationshipOrderByAttribute, ' as ')) {
$relationshipOrderByAttribute = (string) str($relationshipOrderByAttribute)->before(' as ');
}
$relationshipQuery->orderBy($relationshipQuery->qualifyColumn($relationshipOrderByAttribute));
@@ -863,8 +863,8 @@ class Select extends Field implements Contracts\CanDisableOptions, Contracts\Has
if (empty($relationshipQuery->getQuery()->orders)) {
$relationshipOrderByAttribute = $relationshipTitleAttribute;
if (str_contains($relationshipTitleAttribute, ' as ')) {
$relationshipOrderByAttribute = substr($relationshipTitleAttribute, 0, strpos($relationshipTitleAttribute, ' as '));
if (str_contains($relationshipOrderByAttribute, ' as ')) {
$relationshipOrderByAttribute = (string) str($relationshipOrderByAttribute)->before(' as ');
}
$relationshipQuery->orderBy($relationshipQuery->qualifyColumn($relationshipOrderByAttribute));
packages/tables/src/Columns/SelectColumn.php
+14 -2
View File
@@ -592,7 +592,13 @@ class SelectColumn extends Column implements Editable, HasEmbeddedView
$relationshipTitleAttribute = $column->getOptionsRelationshipTitleAttribute();
if (empty($relationshipQuery->getQuery()->orders)) {
$relationshipQuery->orderBy($relationshipQuery->qualifyColumn($relationshipTitleAttribute));
$relationshipOrderByAttribute = $relationshipTitleAttribute;
if (str_contains($relationshipOrderByAttribute, ' as ')) {
$relationshipOrderByAttribute = (string) str($relationshipOrderByAttribute)->before(' as ');
}
$relationshipQuery->orderBy($relationshipQuery->qualifyColumn($relationshipOrderByAttribute));
}
if (str_contains($relationshipTitleAttribute, '->')) {
@@ -646,7 +652,13 @@ class SelectColumn extends Column implements Editable, HasEmbeddedView
$relationshipTitleAttribute = $column->getOptionsRelationshipTitleAttribute();
if (empty($relationshipQuery->getQuery()->orders)) {
$relationshipQuery->orderBy($relationshipQuery->qualifyColumn($relationshipTitleAttribute));
$relationshipOrderByAttribute = $relationshipTitleAttribute;
if (str_contains($relationshipOrderByAttribute, ' as ')) {
$relationshipOrderByAttribute = (string) str($relationshipOrderByAttribute)->before(' as ');
}
$relationshipQuery->orderBy($relationshipQuery->qualifyColumn($relationshipOrderByAttribute));
}
if (str_contains($relationshipTitleAttribute, '->')) {
packages/tables/src/Filters/SelectFilter.php
+14 -2
View File
@@ -367,7 +367,13 @@ class SelectFilter extends BaseFilter
$relationshipTitleAttribute = $component->getRelationshipTitleAttribute();
if (empty($relationshipQuery->getQuery()->orders)) {
$relationshipQuery->orderBy($relationshipQuery->qualifyColumn($relationshipTitleAttribute));
$relationshipOrderByAttribute = $relationshipTitleAttribute;
if (str_contains($relationshipOrderByAttribute, ' as ')) {
$relationshipOrderByAttribute = (string) str($relationshipOrderByAttribute)->before(' as ');
}
$relationshipQuery->orderBy($relationshipQuery->qualifyColumn($relationshipOrderByAttribute));
}
if (str_contains($relationshipTitleAttribute, '->')) {
@@ -427,7 +433,13 @@ class SelectFilter extends BaseFilter
$relationshipTitleAttribute = $component->getRelationshipTitleAttribute();
if (empty($relationshipQuery->getQuery()->orders)) {
$relationshipQuery->orderBy($relationshipQuery->qualifyColumn($relationshipTitleAttribute));
$relationshipOrderByAttribute = $relationshipTitleAttribute;
if (str_contains($relationshipOrderByAttribute, ' as ')) {
$relationshipOrderByAttribute = (string) str($relationshipOrderByAttribute)->before(' as ');
}
$relationshipQuery->orderBy($relationshipQuery->qualifyColumn($relationshipOrderByAttribute));
}
if (str_contains($relationshipTitleAttribute, '->')) {