diff --git a/app/Http/Controllers/Admin/OrganizationController.php b/app/Http/Controllers/Admin/OrganizationController.php index 2fa898e..eb631bf 100755 --- a/app/Http/Controllers/Admin/OrganizationController.php +++ b/app/Http/Controllers/Admin/OrganizationController.php @@ -18,7 +18,7 @@ class OrganizationController extends Controller { Gate::authorize('viewAny', Organization::class); - $organizations = Organization::withCount('users', 'groups', 'courses') + $organizations = Organization::withCount(['users', 'groups']) ->orderBy('created_at', 'desc') ->paginate(20); diff --git a/app/Models/Organization.php b/app/Models/Organization.php index 46b3199..7bb3038 100755 --- a/app/Models/Organization.php +++ b/app/Models/Organization.php @@ -46,6 +46,12 @@ class Organization extends Model return $this->hasMany(CourseAssignment::class); } + public function courses() + { + // Получаем курсы через назначения + return $this->hasManyThrough(Course::class, CourseAssignment::class, 'organization_id'); + } + public function activeUsers(): HasMany { return $this->hasMany(User::class)->where('is_active', true); diff --git a/resources/views/admin/organizations/index.blade.php b/resources/views/admin/organizations/index.blade.php index ba9e30c..57b0cf2 100644 --- a/resources/views/admin/organizations/index.blade.php +++ b/resources/views/admin/organizations/index.blade.php @@ -74,7 +74,6 @@ Email Пользователей Групп - Курсов Статус Действия @@ -99,7 +98,6 @@ {{ $org->email ?? '—' }} {{ $org->users_count }} {{ $org->groups_count }} - {{ $org->courses_count ?? 0 }} @if($org->is_active) Активна