X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fcontrollers%2Fballoons_controller.rb;h=69a9232230206688ddc9e7d6ff959e0dcafaddcb;hp=617e9b5dbe749d72a66627ba1c166a33506bbbff;hb=46ddebc32f7409dc749f83c710aba9a345381165;hpb=8d0ff88e6f28087581d8a4b70d7bc0a2a714da91

diff --git a/app/controllers/balloons_controller.rb b/app/controllers/balloons_controller.rb
index 617e9b5d..69a92322 100644
--- a/app/controllers/balloons_controller.rb
+++ b/app/controllers/balloons_controller.rb
@@ -1,5 +1,7 @@
 class BalloonsController < ApplicationController
-  before_filter :authenticate_user!, :except => [:index]
+  before_filter :authenticate_author!, :only => [:index, :show]
+  before_filter :authenticate_admin!, :only => [:list, :browse]
+  
   # GET /balloons
   # GET /balloons.json
   def index
@@ -11,76 +13,12 @@ class BalloonsController < ApplicationController
     end
   end
 
-=begin
-  # GET /balloons/1
-  # GET /balloons/1.json
-  def show
-    @balloon = Balloon.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @balloon }
-    end
-  end
-
-  # GET /balloons/new
-  # GET /balloons/new.json
-  def new
-    @balloon = Balloon.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @balloon }
-    end
-  end
-
-  # GET /balloons/1/edit
-  def edit
-    @balloon = Balloon.find(params[:id])
-  end
-
-  # POST /balloons
-  # POST /balloons.json
-  def create
-    @balloon = Balloon.new(params[:balloon])
-
-    respond_to do |format|
-      if @balloon.save
-        format.html { redirect_to @balloon, notice: 'Balloon was successfully created.' }
-        format.json { render json: @balloon, status: :created, location: @balloon }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @balloon.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /balloons/1
-  # PUT /balloons/1.json
-  def update
-    @balloon = Balloon.find(params[:id])
-
-    respond_to do |format|
-      if @balloon.update_attributes(params[:balloon])
-        format.html { redirect_to @balloon, notice: 'Balloon was successfully updated.' }
-        format.json { head :ok }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @balloon.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /balloons/1
-  # DELETE /balloons/1.json
-  def destroy
-    @balloon = Balloon.find(params[:id])
-    @balloon.destroy
+  def list
+    @balloons = Balloon.all
 
     respond_to do |format|
-      format.html { redirect_to balloons_url }
-      format.json { head :ok }
+      format.html { render layout: 'system' }
+      format.json { render json: @balloons }
     end
   end
-=end
 end