X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fstories_controller.rb;h=c8a836571b19c20dc77766ecff51b1504282e296;hb=eb5aee94f87dd1a2c7ee7a5a6a0e88ae3e235166;hp=f27fa6826dccb648f8e82686aa0f376879408c5e;hpb=01bd644358713f599c11908152f12b911593b190;p=pettanr%2Fpettanr.git diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb index f27fa682..c8a83657 100644 --- a/app/controllers/stories_controller.rb +++ b/app/controllers/stories_controller.rb @@ -28,7 +28,7 @@ class StoriesController < ApplicationController end def show - @story = Story.show(params[:id], [@user, @admin]) + @item = Story.show(params[:id], [@user, @admin]) respond_to do |format| format.html { @@ -36,8 +36,8 @@ class StoriesController < ApplicationController @new_sheets = Sheet.mylist(@author, 1, 5) end } - format.prof { render :template => 'top/prof', :layout => true } - format.json { render json: @story.to_json(Story.show_json_opt) } + format_prof format + format.json { render json: @item.to_json(Story.show_json_opt) } end end