Merge branch 'master' of github.com:akaunting/akaunting
This commit is contained in:
commit
f47b2ad249
@ -80,6 +80,10 @@ class SearchString extends Component
|
|||||||
|
|
||||||
protected function getFilterKey($column, $options)
|
protected function getFilterKey($column, $options)
|
||||||
{
|
{
|
||||||
|
if (isset($options['key'])) {
|
||||||
|
$column = $options['key'];
|
||||||
|
}
|
||||||
|
|
||||||
if (isset($options['relationship'])) {
|
if (isset($options['relationship'])) {
|
||||||
$column .= '.id';
|
$column .= '.id';
|
||||||
}
|
}
|
||||||
@ -104,7 +108,7 @@ class SearchString extends Component
|
|||||||
if (strpos($this->model, 'Modules') !== false) {
|
if (strpos($this->model, 'Modules') !== false) {
|
||||||
$module_class = explode('\\', $this->model);
|
$module_class = explode('\\', $this->model);
|
||||||
|
|
||||||
$prefix = Str::slug($module_class[1], '-') . '::';
|
$prefix = Str::kebab($module_class[1]) . '::';
|
||||||
|
|
||||||
$translation_keys[] = $prefix . 'general.';
|
$translation_keys[] = $prefix . 'general.';
|
||||||
$translation_keys[] = $prefix . 'search_string.columns.';
|
$translation_keys[] = $prefix . 'search_string.columns.';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user