t#29400:itr3?

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

diff --git a/app/controllers/resource_pictures_controller.rb b/app/controllers/resource_pictures_controller.rb
index b630cdd..8d31b6d 100644 (file)
--- a/app/controllers/resource_pictures_controller.rb
+++ b/app/controllers/resource_pictures_controller.rb
@@ -2,13 +2,14 @@ class ResourcePicturesController < ApplicationController
   layout 'test' if Pettanr::TestLayout
   before_filter :authenticate_user!, :only => [:index, :show, :credit, :new, :create, :update]
   before_filter :authenticate_admin!, :only => [:list, :browse]
+  before_filter :authenticate_artist, :only => [:new, :create]
 
   # GET /resource_pictures
   # GET /resource_pictures.json
   def index
     @page = ResourcePicture.page params[:page]
     @page_size = ResourcePicture.page_size params[:page_size]
-    @resource_pictures = ResourcePicture.list({}, @page, @page_size)
+    @resource_pictures = ResourcePicture.list(@page, @page_size)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -19,7 +20,7 @@ class ResourcePicturesController < ApplicationController
   # GET /resource_pictures/1
   # GET /resource_pictures/1.json
   def show
-    @resource_picture = ResourcePicture.show(params[:id])
+    @resource_picture = ResourcePicture.show(params[:id], @author)
 
     respond_to do |format|
       opt = {:type => @resource_picture.mime_type, :disposition=>"inline"}
@@ -27,24 +28,31 @@ class ResourcePicturesController < ApplicationController
       format.gif { send_data(@resource_picture.restore(params[:subdir]), opt ) }
       format.jpeg { send_data(@resource_picture.restore(params[:subdir]), opt ) }
       format.html # show.html.erb
-      format.json { render :json => @resource_picture.to_json(ResourcePicture.list_json_opt)}
+      format.json { render :json => @resource_picture.to_json(ResourcePicture.show_json_opt)}
     end
   end
   
   def credit
-    @resource_picture = ResourcePicture.show(params[:id])
+    @resource_picture = ResourcePicture.show(params[:id], @author)
 
     respond_to do |format|
       format.html { render :layout => false } # show.html.erb
-      format.json { render :json => @resource_picture.to_json(ResourcePicture.list_json_opt)}
+      format.json { render :json => @resource_picture.to_json(ResourcePicture.show_json_opt)}
     end
   end
   
   def new
-    @original_picture = OriginalPicture.show params[:original_picture_id], @artist
+    @original_picture = OriginalPicture.edit params[:original_picture_id], @artist
+    @imager = PettanImager.load @original_picture.restore
     @original_picture_license_group = OriginalPictureLicenseGroup.new params[:original_picture_license_group]
     @license_group = LicenseGroup.show @original_picture_license_group.license_group_id
-    @resource_picture = @original_picture.resource_picture || ResourcePicture.new(params[:resource_picture])
+    @resource_picture = @original_picture.resource_picture
+    unless @resource_picture
+      @resource_picture = ResourcePicture.new
+      @resource_picture.supply_default
+    end
+    @resource_picture.attributes = params[:resource_picture]
+    @resource_picture.overwrite @original_picture
     @license = @resource_picture.license
     
     respond_to do |format|
@@ -54,38 +62,26 @@ class ResourcePicturesController < ApplicationController
   end
   
   def create
-    @original_picture = OriginalPicture.show params[:original_picture_id], @artist
-    @original_picture_license_group = OriginalPictureLicenseGroup.new params[:original_picture_license_group]
-    @license_group = LicenseGroup.show @original_picture_license_group.license_group_id
-    @resource_picture = ResourcePicture.new(params[:resource_picture])
-    @license = @resource_picture.license
-
-    respond_to do |format|
-      if @resource_picture.store
-        format.html { redirect_to @resource_picture }
-        format.js { render json: @resource_picture, status: :created, location: @resource_picture }
-      else
-        format.html { render action: "new" }
-        format.js { render action: "new" }
-      end
-    end
-  end
-  
-  def update
-    @original_picture = OriginalPicture.show params[:original_picture_id], @artist
+    @original_picture = OriginalPicture.edit params[:original_picture_id], @artist
+    @imager = PettanImager.load @original_picture.restore
     @original_picture_license_group = OriginalPictureLicenseGroup.new params[:original_picture_license_group]
     @license_group = LicenseGroup.show @original_picture_license_group.license_group_id
     @resource_picture = @original_picture.resource_picture
-    @resource_picture.attributes =  params[:resource_picture]
+    unless @resource_picture
+      @resource_picture = ResourcePicture.new
+      @resource_picture.supply_default
+    end
+    @resource_picture.attributes = params[:resource_picture]
+    @resource_picture.overwrite @original_picture
     @license = @resource_picture.license
 
     respond_to do |format|
-      if @resource_picture.store
+      if @resource_picture.store(@imager)
         format.html { redirect_to @resource_picture }
-        format.js { render json: @resource_picture, status: :created, location: @resource_picture }
+        format.json { render json: @resource_picture.to_json(ResourcePicture.show_json_opt), status: :created, location: @resource_picture }
       else
         format.html { render action: "new" }
-        format.js { render action: "new" }
+        format.json { render json: @resource_picture.errors, status: :unprocessable_entity }
       end
     end
   end