Merge branch 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05

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

diff --git a/app/controllers/comics_controller.rb b/app/controllers/comics_controller.rb
index df4e9fd..0539fe5 100644 (file)
--- a/app/controllers/comics_controller.rb
+++ b/app/controllers/comics_controller.rb
@@ -1,22 +1,21 @@
 class ComicsController < ApplicationController
   layout 'test' if MagicNumber['test_layout']
   if MagicNumber['run_mode'] == 0
-    before_filter :authenticate_user!, :only => [:new, :create, :edit, :update, :destroy]
+    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
-    before_filter :authenticate_user!, :only => [:top, :index, :show, :new, :create, :edit, :update, :destroy]
-    before_filter :authenticate_author, :only => [:top, :index, :show, :new, :create, :edit, :update, :destroy]
+    before_filter :authenticate_reader, :only => [:top, :index, :show]
+    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
   def top
     respond_to do |format|
-      format.html # index.html.erb
+      format.html 
     end
   end
   
-  # GET /comics
-  # GET /comics.json
   def index
     @page = Comic.page params[:page]
     @page_size = Comic.page_size params[:page_size]
@@ -27,10 +26,8 @@ class ComicsController < ApplicationController
     end
   end
 
-  # GET /comics/1
-  # GET /comics/1.json
   def show
-    @comic = Comic.show(params[:id], @author)
+    @comic = Comic.show(params[:id], [@user, @admin])
 
     respond_to do |format|
       format.html # show.html.erb
@@ -63,8 +60,6 @@ class ComicsController < ApplicationController
     end
   end
   
-  # GET /comics/new
-  # GET /comics/new.js
   def new
     @comic = Comic.new
     @comic.supply_default
@@ -75,8 +70,6 @@ class ComicsController < ApplicationController
     end
   end
 
-  # GET /comics/1/edit
-  # GET /comics/1.js/edit
   def edit
     @comic = Comic.edit(params[:id], @author)
     respond_to do |format|
@@ -85,8 +78,6 @@ class ComicsController < ApplicationController
     end
   end
 
-  # POST /comics
-  # POST /comics.json
   def create
     @comic = Comic.new
     @comic.supply_default 
@@ -95,7 +86,8 @@ class ComicsController < ApplicationController
 
     respond_to do |format|
       if @comic.save
-        format.html { redirect_to @comic, notice: 'Comic was successfully created.' }
+        flash[:notice] = I18n.t('flash.notice.created', :model => Comic.model_name.human)
+        format.html { redirect_to @comic }
         format.json { render json: @comic.to_json(Comic.show_json_opt), status: :created, location: @comic }
       else
         format.html { render action: "new" }
@@ -104,15 +96,14 @@ class ComicsController < ApplicationController
     end
   end
 
-  # PUT /comics/1
-  # PUT /comics/1.json
   def update
     @comic = Comic.edit(params[:id], @author)
     @comic.attributes = params[:comic]
     @comic.overwrite @author
     respond_to do |format|
       if @comic.save
-        format.html { redirect_to @comic, notice: 'Comic was successfully updated.' }
+        flash[:notice] = I18n.t('flash.notice.updated', :model => Comic.model_name.human)
+        format.html { redirect_to @comic }
         format.json { head :ok }
       else
         format.html { render action: "edit" }
@@ -121,14 +112,18 @@ class ComicsController < ApplicationController
     end
   end
 
-  # DELETE /comics/1
-  # DELETE /comics/1.json
   def destroy
     @comic = Comic.edit(params[:id], @author)
-    @comic.destroy
     respond_to do |format|
-      format.html { redirect_to comics_url }
-      format.json { head :ok }
+      if @comic.destroy_with_story
+        flash[:notice] = I18n.t('flash.notice.destroyed', :model => Comic.model_name.human)
+        format.html { redirect_to '/home/comic' }
+        format.json { head :ok }
+      else
+        flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => Comic.model_name.human)
+        format.html { redirect_to @comic }
+        format.json { render json: @comic.errors, status: :unprocessable_entity }
+      end
     end
   end
 end