t30329#:i18n flash message

[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 1896730..9739a0e 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -1,7 +1,8 @@
 #原画
 class OriginalPicturesController < ApplicationController
-  layout 'test' if Pettanr::TestLayout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show, :history, :new, :edit, :create, :update, :destroy]
+  before_filter :authenticate_author, :only => [:index, :show, :history, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_admin!, :only => [:list, :browse]
   before_filter :authenticate_artist, :only => [:index, :show, :history, :new, :edit, :create, :update, :destroy]
   
@@ -21,7 +22,7 @@ class OriginalPicturesController < ApplicationController
   # GET /original_pictures/1
   # GET /original_pictures/1.json
   def show
-    @original_picture = OriginalPicture.show(params[:id], @artist)
+    @original_picture = OriginalPicture.show(params[:id], @admin || @artist)
     
     respond_to do |format|
       opt = {:type => @original_picture.mime_type, :disposition=>"inline"}
@@ -65,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
@@ -78,17 +77,14 @@ class OriginalPicturesController < ApplicationController
     end
   end
 
-  # GET /original_pictures/1/edit
   def edit
-    @original_picture = OriginalPicture.edit(params[:id], @author)
+    @original_picture = OriginalPicture.edit(params[:id], @artist)
     respond_to do |format|
       format.html
       format.js
     end
   end
 
-  # POST /original_pictures
-  # POST /original_pictures.json
   def create
     @imager = PettanImager.load set_image params[:original_picture][:file]
     @original_picture = OriginalPicture.new
@@ -97,7 +93,8 @@ class OriginalPicturesController < ApplicationController
 
     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" }
@@ -106,15 +103,15 @@ class OriginalPicturesController < ApplicationController
     end
   end
 
-  # PUT /original_pictures/1
-  # PUT /original_pictures/1.json
   def update
-    @picture_data = set_image params[:original_picture][:file]
-    @original_picture = OriginalPicture.edit(params[:id], @author)
+    @imager = PettanImager.load set_image params[:original_picture][:file]
+    @original_picture = OriginalPicture.edit(params[:id], @artist)
+    @original_picture.overwrite @artist
 
     respond_to do |format|
-      if @original_picture.store(@picture_data, @artist)
-        format.html { redirect_to @original_picture, notice: 'Original picture was successfully created.' }
+      if @original_picture.store(@imager)
+        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" }
@@ -123,10 +120,8 @@ class OriginalPicturesController < ApplicationController
     end
   end
 
-  # DELETE /original_pictures/1
-  # DELETE /original_pictures/1.json
   def destroy
-    @original_picture = OriginalPicture.edit(params[:id], @author)
+    @original_picture = OriginalPicture.edit(params[:id], @artist)
     OriginalPicture.transaction do
       @original_picture.destroy
     end