t#30328:create op import ...and pull

[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 d3910c8..6b39ad0 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -66,8 +66,6 @@ class OriginalPicturesController < ApplicationController
     end
   end
 
-  # GET /original_pictures/new
-  # GET /original_pictures/new.json
   def new
     @original_picture = OriginalPicture.new
     @original_picture.supply_default
@@ -79,7 +77,6 @@ class OriginalPicturesController < ApplicationController
     end
   end
 
-  # GET /original_pictures/1/edit
   def edit
     @original_picture = OriginalPicture.edit(params[:id], @artist)
     respond_to do |format|
@@ -88,17 +85,20 @@ class OriginalPicturesController < ApplicationController
     end
   end
 
-  # POST /original_pictures
-  # POST /original_pictures.json
   def create
-    @imager = PettanImager.load set_image params[:original_picture][:file]
+    @imager = if params[:original_picture]
+      PettanImager.load set_image params[:original_picture][:file]
+    else
+      nil
+    end
     @original_picture = OriginalPicture.new
     @original_picture.supply_default
     @original_picture.overwrite @artist
 
     respond_to do |format|
       if @original_picture.store(@imager)
-        format.html { redirect_to @original_picture, notice: 'Original picture was successfully created.' }
+        flash[:notice] = I18n.t('flash.notice.created', :model => OriginalPicture.model_name.human)
+        format.html { redirect_to @original_picture }
         format.json { render json: @original_picture.to_json(OriginalPicture.show_json_opt), status: :created, location: @original_picture }
       else
         format.html { render action: "new" }
@@ -107,16 +107,19 @@ class OriginalPicturesController < ApplicationController
     end
   end
 
-  # PUT /original_pictures/1
-  # PUT /original_pictures/1.json
   def update
-    @imager = PettanImager.load set_image params[:original_picture][:file]
+    @imager = if params[:original_picture]
+      PettanImager.load set_image params[:original_picture][:file]
+    else
+      nil
+    end
     @original_picture = OriginalPicture.edit(params[:id], @artist)
     @original_picture.overwrite @artist
 
     respond_to do |format|
       if @original_picture.store(@imager)
-        format.html { redirect_to @original_picture, notice: 'Original picture was successfully created.' }
+        flash[:notice] = I18n.t('flash.notice.updated', :model => OriginalPicture.model_name.human)
+        format.html { redirect_to @original_picture }
         format.json { render json: @original_picture.to_json(OriginalPicture.show_json_opt), status: :created, location: @original_picture }
       else
         format.html { render action: "edit" }
@@ -125,17 +128,17 @@ class OriginalPicturesController < ApplicationController
     end
   end
 
-  # DELETE /original_pictures/1
-  # DELETE /original_pictures/1.json
   def destroy
     @original_picture = OriginalPicture.edit(params[:id], @artist)
-    OriginalPicture.transaction do
-      @original_picture.destroy
-    end
     
     respond_to do |format|
-      format.html { redirect_to original_pictures_url }
-      format.json { head :ok }
+      if @original_picture.destroy_with_resource_picture
+        format.html { redirect_to original_pictures_url }
+        format.json { head :ok }
+      else
+        format.html { redirect_to original_picture_path(@original_picture) }
+        format.json { render json: @original_picture.errors, status: :unprocessable_entity }
+      end
     end
   end
 end