From 14aa49dfdbc153e5895e1cb0f95d1890311bfe9f Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Fri, 12 Feb 2021 13:53:27 +0300 Subject: [PATCH 1/2] key variable must be considered if it is defined in search string --- app/View/Components/SearchString.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php index d3dfb87a9..a863aa109 100644 --- a/app/View/Components/SearchString.php +++ b/app/View/Components/SearchString.php @@ -80,6 +80,10 @@ class SearchString extends Component protected function getFilterKey($column, $options) { + if (isset($options['key'])) { + $column = $options['key']; + } + if (isset($options['relationship'])) { $column .= '.id'; } From baed35a4fddb1b9cb1df4f3e39cfd59b47ca8368 Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Fri, 12 Feb 2021 16:10:03 +0300 Subject: [PATCH 2/2] prefix definition is fixed by converting the use of slug to kebab --- app/View/Components/SearchString.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php index a863aa109..86315ee12 100644 --- a/app/View/Components/SearchString.php +++ b/app/View/Components/SearchString.php @@ -108,7 +108,7 @@ class SearchString extends Component if (strpos($this->model, 'Modules') !== false) { $module_class = explode('\\', $this->model); - $prefix = Str::slug($module_class[1], '-') . '::'; + $prefix = Str::kebab($module_class[1]) . '::'; $translation_keys[] = $prefix . 'general.'; $translation_keys[] = $prefix . 'search_string.columns.';