mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-05-02 08:19:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

(Remove) Select2 ♻️

Browse Source 
- closes #683
This commit is contained in:
HDVinnie
2019-05-29 12:03:57 -04:00
parent 9b3564d377
commit 7e52caf450
12 changed files with 19 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PrivateMessageController.php
+9 -11
View File
@@ -115,10 +115,8 @@ class PrivateMessageController extends Controller
public function makePrivateMessage(Request $request, $receiver_id = '', $username = '')
{
$user = $request->user();
$usernames = User::oldest('username')->get();
return view('pm.send', ['usernames' => $usernames, 'user' => $user, 'receiver_id' => $receiver_id,
'username' => $username, ]);
return view('pm.send', ['user' => $user, 'receiver_id' => $receiver_id, 'username' => $username]);
}
/**
@@ -137,9 +135,16 @@ class PrivateMessageController extends Controller
$dest = 'profile';
}
if ($request->has('receiver_id')) {
$recipient = User::where('username', '=', $request->input('receiver_id'))->firstOrFail();
} else {
return redirect()->route('create', ['username' => $request->user()->username, 'id' => $request->user()->id])
->withErrors($v->errors());
}
$pm = new PrivateMessage();
$pm->sender_id = $user->id;
$pm->receiver_id = $request->input('receiver_id');
$pm->receiver_id = $recipient->id;
$pm->subject = $request->input('subject');
$pm->message = $request->input('message');
$pm->read = 0;
@@ -152,13 +157,6 @@ class PrivateMessageController extends Controller
'read' => 'required',
]);
if ($request->has('receiver_id')) {
$recipient = User::where('id', '=', (int) $request->input('receiver_id'))->firstOrFail();
} else {
return redirect()->route('create', ['username' => $request->user()->username, 'id' => $request->user()->id])
->withErrors($v->errors());
}
if ($v->fails()) {
if ($dest == 'profile') {
return redirect()->route('profile', ['username' => $recipient->slug, 'id'=> $recipient->id])