merge v04

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

diff --git a/app/controllers/original_pictures_controller.rb b/app/controllers/original_pictures_controller.rb
index ef1ff8d..31b3ca1 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -46,11 +46,7 @@ class OriginalPicturesController < ApplicationController
   # GET /original_pictures/1
   # GET /original_pictures/1.json
   def show
-    @original_picture = OriginalPicture.show(params[:id], @author)
-#    if params[:subdir] == 'refresh'
-#      refresh 
-#      return
-#    end
+    @original_picture = OriginalPicture.show(params[:id], @artist)
 
     respond_to do |format|
       opt = {:type => @original_picture.mime_type, :disposition=>"inline"}
@@ -58,7 +54,7 @@ class OriginalPicturesController < ApplicationController
       format.gif { send_data(@original_picture.restore, opt ) }
       format.jpeg { send_data(@original_picture.restore, opt ) }
       format.html # show.html.erb
-      format.json { render json: @original_picture}
+      format.json { render json: @original_picture.to_json(OriginalPicture.show_json_include_opt)}
     end
   end