fix

code4romania · Jan 29, 2024 · d19cb74 · d19cb74
1 parent ef85893
commit d19cb74
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 28 deletions.
diff --git a/app/Filament/Resources/UserResource/RelationManagers/ProjectsRelationManager.php b/app/Filament/Resources/UserResource/RelationManagers/ProjectsRelationManager.php
@@ -5,6 +5,7 @@
 namespace App\Filament\Resources\UserResource\RelationManagers;
 
 use Filament\Forms\Components\TextInput;
+use Filament\Pages\Actions\ViewAction;
 use Filament\Resources\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Resources\Table;
@@ -63,6 +64,7 @@ public static function table(Table $table): Table
             ->headerActions([
             ])
             ->actions([
+                ViewAction::make(),
                 Tables\Actions\DeleteAction::make(),
             ])
             ->bulkActions([

diff --git a/app/Filament/Resources/UserResource/RelationManagers/VolunteersRelationManager.php b/app/Filament/Resources/UserResource/RelationManagers/VolunteersRelationManager.php
@@ -57,6 +57,7 @@ public static function table(Table $table): Table
                         'pending' => 'warning',
                         'approved' => 'success',
                         'rejected' => 'danger',
+                        default => 'primary',
                     }),
             ])
             ->filters([

diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
@@ -71,10 +71,11 @@ protected function projectList(Request $request, string $view): Response
 
     public function show(Project $project)
     {
-        if (! $project->isApproved() && ! auth()->check()) {
+        if (! $project->isPublished() && ! auth()->check()) {
             abort(403);
         }
 
+
         return Inertia::render('Public/Projects/Show', [
             'project' => new ShowProjectResource($project),
         ]);

diff --git a/resources/js/Pages/AdminOng/Organizations/Edit.vue b/resources/js/Pages/AdminOng/Organizations/Edit.vue
@@ -352,33 +352,6 @@
             </Field>
 
             <!-- Edit organizaton address -->
-            <Field :label="$t('organization_address_county_label')" :hasPendingChanges="changes.includes('counties')" alt>
-                <template #value>
-                    {{ originalOrganization.county_names.join(', ') }}
-                </template>
-
-                <template #action>
-                    <EditModal
-                        @action="editField('counties')"
-                        @cancel="
-                            organization.counties = originalOrganization.counties;
-                        "
-                        class="flex justify-end col-span-1"
-                    >
-                        <div class="flex flex-col gap-4 lg:flex-row">
-                            <Select
-                                :label="$t('counties_label')"
-                                :options="counties"
-                                type="object"
-                                v-model="organization.counties"
-                                v-if="!organization.is_national"
-                                :error="errors.counties"
-                                multiple
-                            />
-                        </div>
-                    </EditModal>
-                </template>
-            </Field>
             <Field :label="$t('organization_address_street_address_label')" :hasPendingChanges="changes.includes('address')" alt>
                 <template #value>
                     {{ organization.address }},