FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Private Profile fields not being editable (#1289)

Browse Source 
* Update ProfileController.php

* Update UserRepository.php

* Update UserRepository.php

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>
This commit is contained in:
B.Fatih KOZ
2021-08-30 19:55:33 +03:00
committed by GitHub
parent 57277c558d
commit fc8ca69729
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Frontend/ProfileController.php
View File

@@ -123,7 +123,7 @@ class ProfileController extends Controller
$airlines = $this->airlineRepo->selectBoxList(); $airlines = $this->airlineRepo->selectBoxList();
$airports = $this->airportRepo->selectBoxList(false, setting('pilots.home_hubs_only')); $airports = $this->airportRepo->selectBoxList(false, setting('pilots.home_hubs_only'));
$userFields = $this->userRepo->getUserFields($user, true); $userFields = $this->userRepo->getUserFields($user);
return view('profile.edit', [ return view('profile.edit', [
'user' => $user, 'user' => $user,

9
app/Repositories/UserRepository.php
View File

@@ -36,9 +36,14 @@ class UserRepository extends Repository
* *
* @return \App\Models\UserField[]|\Illuminate\Database\Eloquent\Collection|\Illuminate\Support\Collection * @return \App\Models\UserField[]|\Illuminate\Database\Eloquent\Collection|\Illuminate\Support\Collection
*/ */
public function getUserFields(User $user, $only_public_fields = true): Collection public function getUserFields(User $user, $only_public_fields = null): Collection
{ {
$fields = UserField::where(['private' => !$only_public_fields])->get(); if (is_bool($only_public_fields)) {
$fields = UserField::where(['private' => !$only_public_fields])->get();
} else {
$fields = UserField::get();
}
return $fields->map(function ($field, $_) use ($user) { return $fields->map(function ($field, $_) use ($user) {
foreach ($user->fields as $userFieldValue) { foreach ($user->fields as $userFieldValue) {
if ($userFieldValue->field->slug === $field->slug) { if ($userFieldValue->field->slug === $field->slug) {