list browser created

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

diff --git a/app/controllers/speach_balloons_controller.rb b/app/controllers/speach_balloons_controller.rb
index 1eeba3d..1072cc9 100644 (file)
--- a/app/controllers/speach_balloons_controller.rb
+++ b/app/controllers/speach_balloons_controller.rb
@@ -1,6 +1,6 @@
 class SpeachBalloonsController < ApplicationController
-  before_filter :authenticate_author!, :only => [:index]
-  before_filter :authenticate_admin!, :except => [:index]
+  before_filter :authenticate_author!, :only => [:index, :show]
+  before_filter :authenticate_admin!, :only => [:list, :browse, :create, :update, :destroy]
 
   private
   
@@ -29,7 +29,8 @@ class SpeachBalloonsController < ApplicationController
     res
   end
   
-  public  # GET /speach_balloons
+  public
+  # GET /speach_balloons
   # GET /speach_balloons.json
   def index
     @speach_balloons = SpeachBalloon.all
@@ -60,20 +61,22 @@ class SpeachBalloonsController < ApplicationController
     end
   end
 
-  # GET /speach_balloons/new
-  # GET /speach_balloons/new.json
-  def new
-    @speach_balloon = SpeachBalloon.new
+  def list
+    @speach_balloons = SpeachBalloon.all
 
     respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @speach_balloon }
+      format.html { render layout: 'system' }
+      format.json { render json: @speach_balloons }
     end
   end
 
-  # GET /speach_balloons/1/edit
-  def edit
+  def browse
     @speach_balloon = SpeachBalloon.find(params[:id])
+
+    respond_to do |format|
+      format.html { render layout: 'system' }
+      format.json { render json: @speach_balloon }
+    end
   end
 
   # POST /speach_balloons