전체공지, 자유게시판 삭제 기능 추가

k352ex · Nov 21, 2015 · 14b7348 · 14b7348
1 parent af02547
commit 14b7348
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/app/controllers/freeboard_controller.rb b/app/controllers/freeboard_controller.rb
@@ -40,6 +40,12 @@ def update
  		end
 	end
 
+  def destroy
+    @freeboard = Freeboard.find(params[:id])
+    @freeboard.destroy
+    redirect_to freeboard_index_path
+  end
+
 
 	private
 

diff --git a/app/controllers/notice_controller.rb b/app/controllers/notice_controller.rb
@@ -44,6 +44,12 @@ def update
  		end
 	end
 
+  def destroy
+    @post = Post.find(params[:id])
+    @post.destroy
+    redirect_to notice_index_path
+  end
+
 	private
 
 	def post_params

diff --git a/app/views/freeboard/index.html.erb b/app/views/freeboard/index.html.erb
@@ -20,11 +20,11 @@
             <%= render :partial => 'freeboard/freeboard' %>
   	  	</tbody>
   	</table>
-      <div class="pull-right">
-    	   <%= link_to("글 작성", new_freeboard_path, class: "btn btn-default", role: "button") %>
-     </div>
+
+	   <%= link_to("글 작성", new_freeboard_path, class: "btn btn-default pull-right", role: "button") %>
+
      <div class="text-center paginator">
-       <%= paginate @freeboard %>
+       <%= paginate @freeboard, :window => 2 %>
      </div>
      <div id="counter"class="pagination_count text-center">
        <%= page_entries_info @freeboard, :remote => true %>

diff --git a/app/views/freeboard/show.html.erb b/app/views/freeboard/show.html.erb
@@ -24,6 +24,7 @@
     <% if current_user.id == @freeboard.user_id %>
     <div class="pull-right">
       <%= link_to("Edit", edit_freeboard_path(@freeboard), class: "btn btn-default") %>
+      <%= link_to("삭제", freeboard_path(@freeboard), class: "btn btn-default", method: :delete, data: { confirm: '정말로 삭제하시겠습니까?' }) %>
     </div>
     <% end %>
   </div>

diff --git a/app/views/notice/index.html.erb b/app/views/notice/index.html.erb
@@ -23,11 +23,9 @@
             <%= render :partial => 'notice/post' %>
   	  	</tbody>
       </table>
-      <div class="pull-right">
-        <%= link_to("글 작성", new_notice_path, class: "btn btn-default", role: "button") %>
-      </div>
+        <%= link_to("글 작성", new_notice_path, class: "btn btn-default pull-right", role: "button") %>
       <div class="text-center paginator">
-        <%= paginate @post %>
+        <%= paginate @post, :window => 2 %>
       </div>
       <div id="counter"class="pagination_count text-center">
         <%= page_entries_info @post, :remote => true %>

diff --git a/app/views/notice/show.html.erb b/app/views/notice/show.html.erb
@@ -28,7 +28,8 @@
         <%= raw @post.content  %>
         <% if current_user.id == @post.user_id %>
         <div class="pull-right">
-          <%= link_to("Edit", edit_notice_path(@post), class: "btn btn-default") %>
+          <%= link_to("수정", edit_notice_path(@post), class: "btn btn-default") %>
+          <%= link_to("삭제", notice_path(@post), class: "btn btn-default", method: :delete, data: { confirm: '정말로 삭제하시겠습니까?' }) %>
         </div>
         <% end %>