Merge pull request #2304 from sevannerse/CU-1pbthq3_Make-Recurring-Easier-to-Find--Edit_Sevan-Nerse

Make recurring easier to find
This commit is contained in:
Cüneyt Şentürk
2021-11-11 14:22:21 +03:00
committed by GitHub
17 changed files with 230 additions and 25 deletions

View File

@ -89,12 +89,12 @@ class SearchString extends Component
$column = $options['key'];
}
if (isset($options['relationship'])) {
if (isset($options['foreign_key'])) {
$column .= '.' . $options['foreign_key'];
} else {
$column .= '.id';
}
if (isset($options['relationship']) && isset($options['foreign_key']) && !empty($options['foreign_key'])) {
$column .= '.' . $options['foreign_key'];
}
if (isset($options['relationship']) && !isset($options['foreign_key'])) {
$column .= '.id';
}
return $column;