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

improved widget/report permissions

Browse Source
This commit is contained in:
Denis Duliçi
2020-06-13 00:13:39 +03:00
parent 6ca0ec5522
commit e1743e1f8f
4 changed files with 65 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Common/Dashboards.php
View File

@ -10,7 +10,6 @@ use App\Jobs\Common\UpdateDashboard;
use App\Models\Common\Company;
use App\Models\Common\Dashboard;
use App\Models\Common\Widget;
use App\Models\Module\Module;
use App\Traits\DateTime;
use App\Traits\Users;
use App\Utilities\Widgets;
@ -69,13 +68,7 @@ class Dashboards extends Controller
}
$widgets = Widget::where('dashboard_id', $dashboard->id)->orderBy('sort', 'asc')->get()->filter(function ($widget) {
if ($alias = Widgets::getModuleAlias($widget->class)) {
if (!Module::alias($alias)->enabled()->first()) {
return false;
}
}
return Widgets::canRead($widget->class);
return Widgets::canShow($widget->class);
});
$financial_start = $this->getFinancialStart()->format('Y-m-d');