mirror of
https://github.com/freescout-helpdesk/freescout.git
synced 2024-11-24 11:22:42 +01:00
Apply fixes from StyleCI
This commit is contained in:
parent
3a0d8b7de9
commit
0ce7cce32a
@ -3,7 +3,6 @@
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Conversation;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class ConversationsController extends Controller
|
||||
{
|
||||
|
@ -3,10 +3,10 @@
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\ActivityLog;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Conversation;
|
||||
use App\Events\ConversationStatusChanged;
|
||||
use App\Events\ConversationUserChanged;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class SecureController extends Controller
|
||||
{
|
||||
|
@ -4,7 +4,6 @@ namespace App;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use App\User;
|
||||
|
||||
class Mailbox extends Model
|
||||
{
|
||||
@ -268,6 +267,7 @@ class Mailbox extends Model
|
||||
{
|
||||
$users = $this->users;
|
||||
$admins = User::where('role', User::ROLE_ADMIN)->get();
|
||||
|
||||
return $users->merge($admins)->unique();
|
||||
}
|
||||
|
||||
@ -278,6 +278,7 @@ class Mailbox extends Model
|
||||
{
|
||||
$user_ids = $this->users()->pluck('users.id');
|
||||
$admin_ids = User::where('role', User::ROLE_ADMIN)->pluck('id');
|
||||
|
||||
return $user_ids->merge($admin_ids)->unique()->toArray();
|
||||
}
|
||||
}
|
||||
|
@ -290,9 +290,9 @@ class Thread extends Model
|
||||
public function getAssignedName()
|
||||
{
|
||||
if (!$this->user_id) {
|
||||
return __("anyone");
|
||||
return __('anyone');
|
||||
} elseif ($this->user_id == auth()->user()->id) {
|
||||
return __("yourself");
|
||||
return __('yourself');
|
||||
} else {
|
||||
return $this->user->getFullName();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user