t#30200:update i18n devise

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

diff --git a/app/controllers/comics_controller.rb b/app/controllers/comics_controller.rb
index 4444e83..df4e9fd 100644 (file)
--- a/app/controllers/comics_controller.rb
+++ b/app/controllers/comics_controller.rb
@@ -1,18 +1,15 @@
 class ComicsController < ApplicationController
-  layout 'test' if Pettanr::TestLayout
-  if Const.run_mode == 0
+  layout 'test' if MagicNumber['test_layout']
+  if MagicNumber['run_mode'] == 0
     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, :play, :new, :create, :edit, :update, :destroy]
+    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]
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
   def top
-    @new_comics = Comic.find(:all, 
-      :include => :author, :conditions => ['visible > 0'], :order => 'updated_at desc', :limit => 5
-    )
-    @new_pictures = OriginalPicture.list @artist.id
-
     respond_to do |format|
       format.html # index.html.erb
     end
@@ -23,7 +20,7 @@ class ComicsController < ApplicationController
   def index
     @page = Comic.page params[:page]
     @page_size = Comic.page_size params[:page_size]
-    @comics = Comic.list({}, @page, @page_size)
+    @comics = Comic.list(@page, @page_size)
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @comics.to_json(Comic.list_json_opt) }
@@ -37,7 +34,7 @@ class ComicsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render json: @comic.to_json(Comic.show_json_include_opt) }
+      format.json { render json: @comic.to_json(Comic.show_json_opt) }
     end
   end
 
@@ -74,6 +71,7 @@ class ComicsController < ApplicationController
     respond_to do |format|
       format.html # new.html.erb
       format.js
+      format.json { render json: @comic.to_json(Comic.show_json_opt) }
     end
   end
 
@@ -81,7 +79,6 @@ class ComicsController < ApplicationController
   # GET /comics/1.js/edit
   def edit
     @comic = Comic.edit(params[:id], @author)
-    @comic.supply_default
     respond_to do |format|
       format.html 
       format.js
@@ -91,7 +88,6 @@ class ComicsController < ApplicationController
   # POST /comics
   # POST /comics.json
   def create
-    params[:comic].merge! author_id: @author.id
     @comic = Comic.new
     @comic.supply_default 
     @comic.attributes = params[:comic]
@@ -100,7 +96,7 @@ class ComicsController < ApplicationController
     respond_to do |format|
       if @comic.save
         format.html { redirect_to @comic, notice: 'Comic was successfully created.' }
-        format.json { render json: Comic.show(@comic.id, @author).to_json(Comic.show_json_include_opt), status: :created, location: @comic }
+        format.json { render json: @comic.to_json(Comic.show_json_opt), status: :created, location: @comic }
       else
         format.html { render action: "new" }
         format.json { render json: @comic.errors, status: :unprocessable_entity }