fix slug issues

code4romania · Jan 17, 2024 · 38b0482 · 38b0482
1 parent ab3fdfc
commit 38b0482
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 5 deletions.
diff --git a/app/Concerns/HasSlug.php b/app/Concerns/HasSlug.php
@@ -91,6 +91,7 @@ public function generateSlug(): string
         $base = $slug = Str::slug($this->{$this->getSlugFieldSource()});
         $suffix = 1;
 
+
         while ($this->slugAlreadyUsed($slug)) {
             $slug = Str::slug($base . '_' . $suffix++);
         }

diff --git a/app/Filament/Resources/OrganizationResource/Widgets/ApprovedOrganizationsWidget.php b/app/Filament/Resources/OrganizationResource/Widgets/ApprovedOrganizationsWidget.php
@@ -78,4 +78,5 @@ protected function getTableActions(): array
             DeactivateOrganizationAction::make(),
         ];
     }
+
 }
diff --git a/app/Filament/Resources/OrganizationResource/Widgets/BaseOrganizationsWidget.php b/app/Filament/Resources/OrganizationResource/Widgets/BaseOrganizationsWidget.php
@@ -95,7 +95,7 @@ protected function getTableRecordUrlUsing(): \Closure
 
     protected function paginateTableQuery(Builder $query): Paginator
     {
-        return $query->simplePaginate(
+        return $query->paginate(
             $this->getTableRecordsPerPage() == -1 ? $query->count() : $this->getTableRecordsPerPage(),
             ['*'],
             $this->getTablePaginationPageName(),

diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php
@@ -157,6 +157,7 @@ public static function table(Table $table): Table
                 Tables\Actions\EditAction::make(),
 
             ])
+            ->defaultSort('id', 'desc')
             ->bulkActions([
                 Tables\Actions\DeleteBulkAction::make(),
             ])

diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -56,6 +56,7 @@ public function store(RegistrationRequest $request): RedirectResponse
         if ($user->hasRole(UserRole::ADMIN)) {
             $attributes['ngo']['status'] = OrganizationStatus::draft;
             $attributes['ngo']['slug'] = Str::slug($attributes['ngo']['name']);
+            dd(collect($attributes['ngo'])->toJson());
 
             $organization = Organization::create($attributes['ngo']);
 

diff --git a/app/Models/Organization.php b/app/Models/Organization.php
@@ -44,7 +44,6 @@ class Organization extends Model implements HasMedia
     protected $fillable = [
         'name',
         'cif',
-        //        'slug',
         'description',
         'address',
         'contact_person',
@@ -82,6 +81,8 @@ class Organization extends Model implements HasMedia
         'statute',
     ];
 
+    private string $slugFieldSource = 'name';
+
     public function projects(): HasMany
     {
         return $this->hasMany(Project::class)->without('organization');
@@ -166,12 +167,12 @@ public function scopeWhereDoesntHaveProjects(Builder $query): Builder
 
     public function scopeWhereHasActiveProjects(Builder $query): Builder
     {
-        return $query->whereRelation('projects', 'status', ProjectStatus::active);
+        return $query->whereRelation('projects', 'status', ProjectStatus::approved);
     }
 
     public function scopeWhereDoesntHaveActiveProjects(Builder $query): Builder
     {
-        return $query->whereRelation('projects', 'status', '!=', ProjectStatus::active);
+        return $query->whereRelation('projects', 'status', '!=', ProjectStatus::approved);
     }
 
     public function scopeWhereHasEuPlatesc(Builder $query): Builder

diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
@@ -62,7 +62,7 @@ public function run(): void
             ->create();
 
         Organization::factory()
-            ->count(5)
+            ->count(50)
             ->approved()
             ->create();