list browser created

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

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index c67cc58..82475e9 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -1,5 +1,6 @@
 class PanelsController < ApplicationController
-  before_filter :authenticate_author!, :except => [:index, :show]
+  before_filter :authenticate_author!, :only => [:index, :show, :create, :update, :destroy]
+  before_filter :authenticate_admin!, :only => [:list, :browse]
 
   private
   
@@ -12,11 +13,13 @@ class PanelsController < ApplicationController
   # GET /panels
   # GET /panels.json
   def index
-    @panels = Panel.all :order => 'updated_at'
+    @panels = Panel.find(:all, :include => [:comic, :author], :order => 'updated_at', :limit => 20)
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @panels }
+      format.json { render :json => @panels.to_json(
+        :include => [:comic, :author]
+      ) }
     end
   end
 
@@ -40,23 +43,24 @@ class PanelsController < ApplicationController
 #      format.json { render :json => @frame.to_json(include: {
 #        :comic => {:only => :title}, :panel_pictures => {:include => {:image => {:only => [:width]}},:only => [:width, :height, :z, :image_id]}
 #      }, only: [:border]) }
-   end
+    end
   end
 
-  # GET /panels/new
-  # GET /panels/new.json
-  def new
-    @panel = Panel.new
+  def list
+    @panels = Panel.all :order => 'updated_at'
 
     respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @panel }
+      format.html { render layout: 'system' }
+      format.json { render json: @panels }
     end
   end
 
-  # GET /panels/1/edit
-  def edit
+  def browse
     @panel = Panel.find(params[:id])
+
+    respond_to do |format|
+      format.html { render layout: 'system' }
+    end
   end
 
   # POST /panels