X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fcontrollers%2Fpanels_controller.rb;fp=app%2Fcontrollers%2Fpanels_controller.rb;h=85cd8ced9cb846ea6121513facd5ec7c2cf1c4ab;hp=2dc0e676b9914a9fbf677af845ab2cb2dab04eb1;hb=f8372419b618c4e2995c15e45f098935667cbe72;hpb=d8618208084fd87747ac1a3a8c8a4f44b23dab43

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index 2dc0e676..85cd8ced 100644
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -121,18 +121,13 @@ class PanelsController < ApplicationController
   # DELETE /panels/1
   # DELETE /panels/1.json
   def destroy
-    @panel = Panel.find(params[:id])
-    if @panel.own? @author
-      respond_to do |format|
-        Panel.transaction do
-          @panel.destroy_and_shorten
-          format.html { redirect_to panels_url }
-          format.json { head :ok }
-        end
+    @panel = Panel.edit(params[:id], @author)
+    respond_to do |format|
+      Panel.transaction do
+        @panel.destroy
+        format.html { redirect_to panels_url }
+        format.json { head :ok }
       end
-    else
-      format.html { render action: "edit" }
-      format.json { render json: @panel.errors, status: :unprocessable_entity }
     end
   end