fixed installer

This commit is contained in:
denisdulici 2020-01-04 21:53:10 +03:00
parent 0028504c58
commit f80ff64dc1
5 changed files with 7 additions and 7 deletions

View File

@ -41,7 +41,7 @@ class Dashboard extends Controller
// Widgets // Widgets
$widgets = Widget::where('dashboard_id', $dashboard->id)->orderBy('sort', 'asc')->get()->filter(function ($widget) { $widgets = Widget::where('dashboard_id', $dashboard->id)->orderBy('sort', 'asc')->get()->filter(function ($widget) {
return WidgetUtility::canRead($widget->class); return WidgetUtility::canRead($widget->class);
})->all(); });
$financial_start = $this->getFinancialStart()->format('Y-m-d'); $financial_start = $this->getFinancialStart()->format('Y-m-d');

View File

@ -8,7 +8,7 @@ use Illuminate\Support\Str;
class Reports class Reports
{ {
public static function getClasses() public static function getClasses($check_permission = true)
{ {
$classes = []; $classes = [];
@ -31,7 +31,7 @@ class Reports
}); });
foreach ($list as $class) { foreach ($list as $class) {
if (!class_exists($class) || !static::canRead($class)) { if (!class_exists($class) || ($check_permission && !static::canRead($class))) {
continue; continue;
} }

View File

@ -8,7 +8,7 @@ use Illuminate\Support\Str;
class Widgets class Widgets
{ {
public static function getClasses() public static function getClasses($check_permission = true)
{ {
$classes = []; $classes = [];
@ -35,7 +35,7 @@ class Widgets
}); });
foreach ($list as $class) { foreach ($list as $class) {
if (!class_exists($class) || !static::canRead($class)) { if (!class_exists($class) || ($check_permission && !static::canRead($class))) {
continue; continue;
} }

View File

@ -16,9 +16,9 @@ class CreateReportsTable extends Migration
Schema::create('reports', function (Blueprint $table) { Schema::create('reports', function (Blueprint $table) {
$table->increments('id'); $table->increments('id');
$table->integer('company_id'); $table->integer('company_id');
$table->string('class');
$table->string('name'); $table->string('name');
$table->text('description'); $table->text('description');
$table->string('class');
$table->string('group'); $table->string('group');
$table->string('period'); $table->string('period');
$table->string('basis'); $table->string('basis');

View File

@ -36,7 +36,7 @@ class Dashboards extends Seeder
'enabled' => 1, 'enabled' => 1,
]); ]);
$widgets = WidgetUtility::getClasses(); $widgets = WidgetUtility::getClasses(false);
$sort = 1; $sort = 1;