Merge pull request #236 from fey/fix/update-comments

fix comments
Hexlet · May 9, 2020 · 345d878 · 345d878
2 parents ad7f47b + 76da92b
commit 345d878
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/app/Helpers/CommentHelper.php b/app/Helpers/CommentHelper.php
@@ -8,7 +8,6 @@ function getCommentLink(Comment $comment): string
         $commentableResourceName = str_plural(strtolower(class_basename($comment->commentable_type)));
         $commentableUrl = route("{$commentableResourceName}.show", $comment->commentable);
         $commentUrl = "{$commentableUrl}#comment-{$comment->id}";
-
         return $commentUrl;
     }
 }
diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
@@ -6,6 +6,8 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 
+use function getCommentLink;
+
 class CommentController extends Controller
 {
     public function __construct()
@@ -37,10 +39,10 @@ public function store(Request $request)
         activity()
             ->performedOn($commentable)
             ->causedBy($user)
-            ->withProperties(['comment' => $comment, 'url' => $this->getCommentUrl($comment)])
+            ->withProperties(['comment' => $comment, 'url' => getCommentLink($comment)])
             ->log('commented');
 
-        return redirect($this->getCommentUrl($comment));
+        return redirect(getCommentLink($comment));
     }
 
     public function update(Request $request, Comment $comment)
@@ -54,9 +56,20 @@ public function update(Request $request, Comment $comment)
             ]
         );
         $content = $request->get('content', $comment->content);
-        $comment->update(['content' => $content]);
+        $comment->fill(['content' => $content]);
+
+        if ($comment->save()) {
+            flash()->success(__('layout.flash.success'));
+        }
+
+        return redirect(getCommentLink($comment));
+    }
 
-        return redirect($this->getCommentUrl($comment));
+    public function show(Comment $comment)
+    {
+        return redirect(
+            getCommentLink($comment)
+        );
     }
 
     public function destroy(Comment $comment)
@@ -65,8 +78,4 @@ public function destroy(Comment $comment)
 
         return back();
     }
-    private function getCommentUrl(Comment $comment)
-    {
-        return url()->previous() . '#comment-' . $comment->id;
-    }
 }
diff --git a/resources/views/components/comment/_modal.blade.php b/resources/views/components/comment/_modal.blade.php
@@ -18,6 +18,8 @@
                 </button>
             </div>
             <div class="modal-body">
+                {!! Form::hidden('commentable_type', $comment->commentable_type) !!}
+                {!! Form::hidden('commentable_id', $comment->commentable_id) !!}
                 {!! Form::textarea('content', __('comment.update_comment_here'), $content)->attrs(['rows' => 3])->required() !!}
             </div>
             <div class="modal-footer text-left">

diff --git a/resources/views/exercise/show.blade.php b/resources/views/exercise/show.blade.php
@@ -37,7 +37,7 @@
                 <p>{{ __('exercise.show.who_completed') }}</p>
                 <ul>
                     @foreach($exercise->users as $user)
-                    <li>{{ $user->name }}</li>
+                    <li><a href="{{ route('users.show', $user) }}">{{ $user->name }}</a></li>
                     @endforeach
                 </ul>
                 @endif

diff --git a/routes/web.php b/routes/web.php
@@ -34,5 +34,5 @@ static function () {
     Route::resource('chapters', 'ChapterController')->only('index', 'show');
     Route::resource('exercises', 'ExerciseController')->only('index', 'show');
     Route::resource('log', 'ActivitylogController')->only('index');
-    Route::resource('comments', 'CommentController')->only('store', 'update', 'destroy');
+    Route::resource('comments', 'CommentController')->only('store', 'update', 'show', 'destroy');
 });