Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Http/Controllers/ResourceEditsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function store(ComputerScienceResource $computerScienceResource, StoreRes
'data' => $validatedData,
]);

return redirect()->back()->withErrors(['error' => 'Failed to create resource edit. Please try again.']);
return redirect()->back()->with('error', 'Failed to create resource edit. Please try again.');
}
}

Expand Down Expand Up @@ -137,7 +137,7 @@ public function merge(ResourceEdits $resourceEdits)
'user_id' => Auth::id(),
]);

return redirect()->back()->withErrors(['error' => 'Failed to merge resource edits. Please try again.']);
return redirect()->back()->with('error', 'Failed to merge resource edits. Please try again.');
}
}
}
1 change: 1 addition & 0 deletions app/Http/Middleware/HandleInertiaRequests.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public function share(Request $request): array
'flash' => [
'success' => $request->session()->get('success'),
'warning' => $request->session()->get('warning'),
'error' => $request->session()->get('error'),
],
'config' => [
'COMMENT_MAX_DEPTH' => config('comment.max_depth'),
Expand Down
2 changes: 1 addition & 1 deletion app/Models/ResourceEdits.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function sluggable(): array
{
return [
'slug' => [
'source' => ['edit_title', 'id'],
'source' => ['edit_title'],
'unique' => true,
],
];
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Components/Navigation/BackButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ const props = defineProps({
<slot />
</div>
</Link>
<div class="mt-2 border-t border-gray-200 dark:border-gray-700"></div>
<div class="my-2 border-t border-gray-200 dark:border-gray-700"></div>
</div>
</template>
8 changes: 8 additions & 0 deletions resources/js/Components/ToastHandler.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ watch(
detail: flash.warning,
life: TOAST_LIFETIME,
});

} else if (flash.error) {
toast.add({
severity: "error",
summary: "Error",
detail: flash.error,
life: TOAST_LIFETIME,
});
}
},
{ deep: true },
Expand Down
4 changes: 3 additions & 1 deletion resources/js/Pages/ResourceEdits/Create.vue
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@ const submit = async () => {
tab: 'edits',
})
"
/>
>
<span class="my-auto">Back to {{ props.resource.name }}</span>
</BackButton>
<FormSaverChip
:is-saved="isSavedToLocalStorage"
:has-content="hasFormContent"
Expand Down