waqas
/
Akaunting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3075 from CihanSenturk/fix-dashboard-bulk-action-issues 

Fixed dashboard bulk action issues
This commit is contained in:
Cüneyt Şentürk 2023-10-21 18:31:10 +03:00 committed by GitHub
parent ec601da600 69649adad8
commit e59cb8f42c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/BulkActions/Common/Dashboards.php
View File

@ -39,19 +39,6 @@ class Dashboards extends BulkAction
],
];
public function enable($request)
{
$dashboards = $this->getSelectedRecords($request);
foreach ($dashboards as $dashboard) {
try {
$this->dispatch(new UpdateDashboard($dashboard, $request->merge(['enabled' => 1])));
} catch (\Exception $e) {
flash($e->getMessage())->error()->important();
}
}
}
public function disable($request)
{
$dashboards = $this->getSelectedRecords($request);

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

@ -32,7 +32,7 @@ class DeleteDashboard extends Job implements ShouldDelete
{
// Can't delete last dashboard for any shared user
foreach ($this->model->users as $user) {
if ($user->dashboards()->enabled()->count() > 1) {
if (! $this->model->enabled || $user->dashboards()->enabled()->count() > 1) {
continue;
}