ilmedova
/
akaunting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'akaunting:master' into master

This commit is contained in:
Burak Civan 2022-06-21 09:29:29 +03:00 committed by GitHub
parent 5b7c246af1 64475adcc4
commit 752090e832
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Common/DeleteCompany.php
View File

@ -34,8 +34,6 @@ class DeleteCompany extends Job implements ShouldDelete
'recurring', 'reports', 'settings', 'taxes', 'transactions', 'transfers', 'widgets',
]);
$this->model->users()->detach();
$this->model->delete();
});

2
app/Jobs/Common/DeleteDashboard.php
View File

@ -19,8 +19,6 @@ class DeleteDashboard extends Job implements ShouldDelete
\DB::transaction(function () {
$this->deleteRelationships($this->model, ['widgets']);
$this->model->users()->detach();
$this->model->delete();
});

2
app/Utilities/Reports.php
View File

@ -54,7 +54,7 @@ class Reports
return false;
}
if (($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
if (! empty($model) && ($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
return false;
}

2
app/Utilities/Widgets.php
View File

@ -65,7 +65,7 @@ class Widgets
$model = Widget::where('dashboard_id', session('dashboard_id'))->where('class', $class_name)->first();
if (($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
if (! empty($model) && ($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
return false;
}

12
app/View/Components/SearchString.php
View File

@ -18,6 +18,11 @@ class SearchString extends Component
/** string */
public $model;
public $skip_columns = [
'created_at',
'updated_at',
];
/**
* Create a new component instance.
*
@ -47,7 +52,12 @@ class SearchString extends Component
foreach ($columns as $column => $options) {
// This column skip for filter
if (!empty($options['searchable'])) {
if (! empty($options['searchable'])) {
continue;
}
// This column skip for filter
if (in_array($column, $this->skip_columns)) {
continue;
}