@@ -20,7 +20,7 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | public function __construct(News $news) |
| 22 | 22 | { |
| 23 | - $this->news = $news; |
|
| 23 | + $this->news = $news; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -25,11 +25,11 @@ |
||
| 25 | 25 | $newCollection = new Collection(); |
| 26 | 26 | |
| 27 | 27 | foreach ($this->list as $entry) { |
| 28 | - if(Gate::allows('view')) { |
|
| 29 | - $rowvalue = "<a href='" . url( 'user', $entry['user']->id ) . "'>". $entry['user']->userFullName ."</a>"; |
|
| 30 | - } else { |
|
| 31 | - $rowvalue = $entry['user']->userFullName; |
|
| 32 | - } |
|
| 28 | + if(Gate::allows('view')) { |
|
| 29 | + $rowvalue = "<a href='" . url( 'user', $entry['user']->id ) . "'>". $entry['user']->userFullName ."</a>"; |
|
| 30 | + } else { |
|
| 31 | + $rowvalue = $entry['user']->userFullName; |
|
| 32 | + } |
|
| 33 | 33 | $newCollection->push([ |
| 34 | 34 | 'row' => $rowvalue, |
| 35 | 35 | 'id' => $entry['user']->id, |
@@ -115,11 +115,11 @@ |
||
| 115 | 115 | { |
| 116 | 116 | $row = ''; |
| 117 | 117 | foreach ($entry['group'] as $user) { |
| 118 | - if(Gate::allows('view')) { |
|
| 119 | - $row .= "<a href='" . url('user', $user->id) . "'>" . $user->userFullName . "</a> & "; |
|
| 120 | - } else { |
|
| 121 | - $row .= $user->userFullName . " & "; |
|
| 122 | - } |
|
| 118 | + if(Gate::allows('view')) { |
|
| 119 | + $row .= "<a href='" . url('user', $user->id) . "'>" . $user->userFullName . "</a> & "; |
|
| 120 | + } else { |
|
| 121 | + $row .= $user->userFullName . " & "; |
|
| 122 | + } |
|
| 123 | 123 | } |
| 124 | 124 | $row = rtrim($row, '& '); |
| 125 | 125 | return $row; |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | foreach ($newsToPublish as $news) { |
| 49 | 49 | $allUsers = User::skipSystem()->active()->get(); |
| 50 | 50 | foreach ($allUsers as $user) { |
| 51 | - Mail::to($user->email)->send(new SendNewsEmail($news)); |
|
| 51 | + Mail::to($user->email)->send(new SendNewsEmail($news)); |
|
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | } |
@@ -130,7 +130,7 @@ |
||
| 130 | 130 | if ($news->send_email && $publishDate->eq(Carbon::now())) { |
| 131 | 131 | $allUsers = User::skipSystem()->active()->get(); |
| 132 | 132 | foreach ($allUsers as $user) { |
| 133 | - Mail::to($user->email)->send(new SendNewsEmail($news)); |
|
| 133 | + Mail::to($user->email)->send(new SendNewsEmail($news)); |
|
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | } |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | |
| 30 | 30 | public function store(TrainingUserRequest $request, User $user) |
| 31 | 31 | { |
| 32 | - $data = $request->all(); |
|
| 32 | + $data = $request->all(); |
|
| 33 | 33 | $data['author_id'] = Auth::user()->id; |
| 34 | 34 | $data['user_id'] = $user->id; |
| 35 | 35 | |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | \SET\Http\Middleware\EncryptCookies::class, |
| 24 | 24 | \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, |
| 25 | 25 | \Illuminate\Session\Middleware\StartSession::class, |
| 26 | - \Krucas\Notification\Middleware\NotificationMiddleware::class, |
|
| 26 | + \Krucas\Notification\Middleware\NotificationMiddleware::class, |
|
| 27 | 27 | \Illuminate\View\Middleware\ShareErrorsFromSession::class, |
| 28 | 28 | \SET\Http\Middleware\VerifyCsrfToken::class, |
| 29 | 29 | \Illuminate\Routing\Middleware\SubstituteBindings::class, |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | public function rules() |
| 24 | 24 | { |
| 25 | 25 | return [ |
| 26 | - 'title' => 'required', |
|
| 26 | + 'title' => 'required', |
|
| 27 | 27 | 'description' => 'required', |
| 28 | 28 | 'publish_date' => 'required', |
| 29 | 29 | 'expire_date' => 'after:publish_date' |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | class TravelRequest extends Request |
| 6 | 6 | { |
| 7 | 7 | |
| 8 | - /** |
|
| 8 | + /** |
|
| 9 | 9 | * Determine if the user is authorized to make this request. |
| 10 | 10 | * |
| 11 | 11 | * @return bool |
@@ -23,9 +23,9 @@ discard block |
||
| 23 | 23 | public function rules() |
| 24 | 24 | { |
| 25 | 25 | return [ |
| 26 | - 'location' => 'required', |
|
| 26 | + 'location' => 'required', |
|
| 27 | 27 | 'leave_date' => 'required', |
| 28 | - 'return_date' => 'required|after:leave_date' |
|
| 28 | + 'return_date' => 'required|after:leave_date' |
|
| 29 | 29 | ]; |
| 30 | 30 | } |
| 31 | 31 | } |