end
def show
- @original_picture = OriginalPicture.show(params[:id], [@artist, @admin])
+ @item = OriginalPicture.show(params[:id], [@artist, @admin])
respond_to do |format|
- opt = {:type => @original_picture.mime_type, :disposition=>"inline"}
- format.png { send_data(@original_picture.restore, opt ) }
- format.gif { send_data(@original_picture.restore, opt ) }
- format.jpeg { send_data(@original_picture.restore, opt ) }
+ opt = {:type => @item.mime_type, :disposition=>"inline"}
+ format.png { send_data(@item.restore, opt ) }
+ format.gif { send_data(@item.restore, opt ) }
+ format.jpeg { send_data(@item.restore, opt ) }
format.html {
#ライセンス付与のために原画ライセンスグループ作成準備
- @original_picture_license_group = OriginalPictureLicenseGroup.new :original_picture_id => @original_picture.id
+ @original_picture_license_group = OriginalPictureLicenseGroup.new :original_picture_id => @item.id
render
}
- format.prof { render :template => 'top/prof', :layout => true }
- format.json { render json: @original_picture.to_json(OriginalPicture.show_json_opt)}
+ format_prof format
+ format.json { render json: @item.to_json(OriginalPicture.show_json_opt)}
end
end