X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fballoons_controller.rb;h=d3c672723200aa0985491ccf384e8a344563e08d;hb=2aa10ee1ef8c348a958cb53b44c51b2cebfaadb7;hp=cb01d58b519f57a22c992fd1e6509ccb54640c0d;hpb=fb5769ff710c952a6b9ed3ce2ee74a6dfdc334cf;p=pettanr%2Fpettanr.git diff --git a/app/controllers/balloons_controller.rb b/app/controllers/balloons_controller.rb index cb01d58b..d3c67272 100644 --- a/app/controllers/balloons_controller.rb +++ b/app/controllers/balloons_controller.rb @@ -2,9 +2,11 @@ class BalloonsController < ApplicationController layout 'test' if MagicNumber['test_layout'] if MagicNumber['run_mode'] == 0 before_filter :authenticate_user, :only => [] + before_filter :authenticate_author, :only => [] else before_filter :authenticate_reader, :only => [:index, :show] before_filter :authenticate_user, :only => [] + before_filter :authenticate_author, :only => [] end before_filter :authenticate_admin!, :only => [:list, :browse] @@ -20,7 +22,7 @@ class BalloonsController < ApplicationController end def show - @balloon = Balloon.show(params[:id], [@author, @admin]) + @balloon = Balloon.show(params[:id], [@user, @admin]) respond_to do |format| format.html # show.html.erb format.json { render json: @balloon.to_json(Balloon.show_json_opt) }