rename foum views

Shawn McCool · Shawn McCool · commit 1968454a9307 · 2013-12-28T00:26:43.000+01:00
move comment type to forum creator class
diff --git a/app/Lio/Forum/ForumThreadCreator.php b/app/Lio/Forum/ForumThreadCreator.php
@@ -31,7 +31,9 @@ public function create(ForumThreadCreatorObserver $observer, $data, $validator =
 
     private function createValidRecord($observer, $data)
     {
-        $thread = $this->comments->getNew($data);
+        $thread = $this->comments->getNew($data + [
+            'type' => Comment::TYPE_FORUM,
+        ]);
 
         // check the model validation
         if ( ! $this->comments->save($thread)) {
diff --git a/app/controllers/ForumController.php b/app/controllers/ForumController.php
@@ -52,7 +52,7 @@ public function getShowThread()
     {
         $thread = App::make('slugModel');
         $comments = $this->comments->getThreadCommentsPaginated($thread, $this->commentsPerPage);
-        $this->view('forum.thread', compact('thread', 'comments'));
+        $this->view('forum.showthread', compact('thread', 'comments'));
     }
 
     // create a thread
@@ -70,7 +70,6 @@ public function postCreateThread()
             'title'           => Input::get('title'),
             'body'            => Input::get('body'),
             'author_id'       => Auth::user()->id,
-            'type'            => Comment::TYPE_FORUM,
             'laravel_version' => Input::get('laravel_version'),
             'tags'            => $tags,
         ], new ForumThreadForm);
@@ -122,6 +121,7 @@ public function forumThreadUpdated($thread)
     // bounces the user to the correct page of a thread for the indicated comment
     public function getCommentRedirect($thread, $commentId)
     {
+        // refactor this
         $comment = Comment::findOrFail($commentId);
         $numberCommentsBefore = Comment::where('parent_id', '=', $comment->parent_id)->where('created_at', '<', $comment->created_at)->count();
         $page = round($numberCommentsBefore / $this->commentsPerPage, 0, PHP_ROUND_HALF_DOWN) + 1;
@@ -167,13 +167,15 @@ public function getSearch()
     {
         $query = Input::get('query');
         $results = App::make('Lio\Comments\ForumSearch')->searchPaginated($query, $this->threadsPerPage);
+
         $this->view('forum.search', compact('query', 'results'));
     }
 
     // reply to a thread
     public function postCreateReply()
     {
         $thread = App::make('slugModel');
+
         return App::make('Lio\Forum\ForumReplyCreator')->create($this, [
             'body'      => Input::get('body'),
             'author_id' => Auth::user()->id,
@@ -185,7 +187,8 @@ public function getEditReply($replyId)
     {
         $reply = $this->comments->requireForumThreadById($replyId);
         if (Auth::user()->id != $reply->author_id) return Redirect::to('/');
-        $this->view('forum.editcomment', compact('reply'));
+
+        $this->view('forum.editreply', compact('reply'));
     }
 
     public function postEditReply($replyId)
diff --git a/app/views/forum/editreply.blade.php b/app/views/forum/editreply.blade.php
@@ -5,9 +5,9 @@
 @stop
 
 @section('content')
-<div class="header">
-    <h1>Edit Your Reply</h1>
-</div>
+    <div class="header">
+        <h1>Edit Your Reply</h1>
+    </div>
 
     <div class="reply-form">
         {{ Form::model($reply->resource) }}
@@ -21,6 +21,7 @@
             <div class="form-row">
                 {{ Form::button('Reply', ['type' => 'submit', 'class' => 'button']) }}
             </div>
+        {{ Form::close() }}
     </div>
 @stop
 
diff --git a/app/views/forum/showthread.blade.php b/app/views/forum/showthread.blade.php

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,9 @@ public function create(ForumThreadCreatorObserver $observer, $data, $validator =`
`31`	`31`
`32`	`32`	`private function createValidRecord($observer, $data)`
`33`	`33`	`{`
`34`		`- $thread = $this->comments->getNew($data);`
	`34`	`+ $thread = $this->comments->getNew($data + [`
	`35`	`+ 'type' => Comment::TYPE_FORUM,`
	`36`	`+ ]);`
`35`	`37`
`36`	`38`	`// check the model validation`
`37`	`39`	`if ( ! $this->comments->save($thread)) {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function getShowThread()`
`52`	`52`	`{`
`53`	`53`	`$thread = App::make('slugModel');`
`54`	`54`	`$comments = $this->comments->getThreadCommentsPaginated($thread, $this->commentsPerPage);`
`55`		`- $this->view('forum.thread', compact('thread', 'comments'));`
	`55`	`+ $this->view('forum.showthread', compact('thread', 'comments'));`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`// create a thread`
`@@ -70,7 +70,6 @@ public function postCreateThread()`
`70`	`70`	`'title' => Input::get('title'),`
`71`	`71`	`'body' => Input::get('body'),`
`72`	`72`	`'author_id' => Auth::user()->id,`
`73`		`- 'type' => Comment::TYPE_FORUM,`
`74`	`73`	`'laravel_version' => Input::get('laravel_version'),`
`75`	`74`	`'tags' => $tags,`
`76`	`75`	`], new ForumThreadForm);`
`@@ -122,6 +121,7 @@ public function forumThreadUpdated($thread)`
`122`	`121`	`// bounces the user to the correct page of a thread for the indicated comment`
`123`	`122`	`public function getCommentRedirect($thread, $commentId)`
`124`	`123`	`{`
	`124`	`+ // refactor this`
`125`	`125`	`$comment = Comment::findOrFail($commentId);`
`126`	`126`	`$numberCommentsBefore = Comment::where('parent_id', '=', $comment->parent_id)->where('created_at', '<', $comment->created_at)->count();`
`127`	`127`	`$page = round($numberCommentsBefore / $this->commentsPerPage, 0, PHP_ROUND_HALF_DOWN) + 1;`
`@@ -167,13 +167,15 @@ public function getSearch()`
`167`	`167`	`{`
`168`	`168`	`$query = Input::get('query');`
`169`	`169`	`$results = App::make('Lio\Comments\ForumSearch')->searchPaginated($query, $this->threadsPerPage);`
	`170`	`+`
`170`	`171`	`$this->view('forum.search', compact('query', 'results'));`
`171`	`172`	`}`
`172`	`173`
`173`	`174`	`// reply to a thread`
`174`	`175`	`public function postCreateReply()`
`175`	`176`	`{`
`176`	`177`	`$thread = App::make('slugModel');`
	`178`	`+`
`177`	`179`	`return App::make('Lio\Forum\ForumReplyCreator')->create($this, [`
`178`	`180`	`'body' => Input::get('body'),`
`179`	`181`	`'author_id' => Auth::user()->id,`
`@@ -185,7 +187,8 @@ public function getEditReply($replyId)`
`185`	`187`	`{`
`186`	`188`	`$reply = $this->comments->requireForumThreadById($replyId);`
`187`	`189`	`if (Auth::user()->id != $reply->author_id) return Redirect::to('/');`
`188`		`- $this->view('forum.editcomment', compact('reply'));`
	`190`	`+`
	`191`	`+ $this->view('forum.editreply', compact('reply'));`
`189`	`192`	`}`
`190`	`193`
`191`	`194`	`public function postEditReply($replyId)`