merge v04

[pettanr/pettanr.git] / app / controllers / panels_controller.rb

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index 527fcf0..abae3f7 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -3,12 +3,6 @@ class PanelsController < ApplicationController
   before_filter :authenticate_user!, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
-  private
-  
-  def treat_param panel
-    panel.author_id = @author.id
-  end
-  
   public
   
   # GET /panels
@@ -64,7 +58,7 @@ class PanelsController < ApplicationController
 
   def new
     @panel = Panel.new
-    @panel.supply_default @author
+    @panel.supply_default
 
     respond_to do |format|
       format.html # new.html.erb
@@ -84,14 +78,14 @@ class PanelsController < ApplicationController
   # POST /panels
   # POST /panels.json
   def create
+    @panel = Panel.new
+    @panel.supply_default
     if params[:json]
       jsn = JSON.parse(params[:json])
     end
     @prm = params[:panel] || jsn
-    @panel = Panel.new(@prm)
-    treat_param @panel
-#    @comic = Comic.find @panel.comic_id
-
+    @panel.attributes = @prm
+    @panel.overwrite @author
     respond_to do |format|
       if @panel.store
         format.html { redirect_to @panel, notice: 'Panel was successfully created.' }
@@ -106,48 +100,34 @@ class PanelsController < ApplicationController
   # PUT /panels/1
   # PUT /panels/1.json
   def update
-    @panel = Panel.find(params[:id])
-    if @panel.own? @author
-      if params[:json]
-        jsn = JSON.parse(params[:json])
-      end
-      @prm = params[:panel] || jsn
-      respond_to do |format|
-        Panel.transaction do
-          if params[:panel][:t] and params[:panel][:t].to_i != @panel.t
-            @panel.move_to params[:panel][:t].to_i
-          end
-          @panel.attributes = @prm
-          if @panel.store
-            format.html { redirect_to @panel, notice: 'Panel was successfully updated.' }
-            format.json { head :ok }
-          else
-            format.html { render action: "edit" }
-            format.json { render json: @panel.errors, status: :unprocessable_entity }
-          end
-        end
+    @panel = Panel.edit(params[:id], @author)
+    if params[:json]
+      jsn = JSON.parse(params[:json])
+    end
+    @prm = params[:panel] || jsn
+    @panel.attributes = @prm
+    @panel.overwrite @author
+    respond_to do |format|
+      if @panel.store
+        format.html { redirect_to @panel, notice: 'Panel was successfully updated.' }
+        format.json { head :ok }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @panel.errors, status: :unprocessable_entity }
       end
-    else
-      format.html { render action: "edit" }
-      format.json { render json: @panel.errors, status: :unprocessable_entity }
     end
   end
 
   # 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