t#30102#30122:update i18n index

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

diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index adbbc20..9e30eda 100644 (file)
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -1,12 +1,23 @@
 class StoriesController < 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]
   else
     before_filter :authenticate_user!, :only => [:index, :show, :comic, :new, :create, :edit, :update, :destroy]
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
+  def index
+    @page = Story.page params[:page]
+    @page_size = Story.page_size params[:page_size]
+    @stories = Story.list(@page, @page_size)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render :json => @stories.to_json(Story.list_json_opt) }
+    end
+  end
+
   def show
     @story = Story.show(params[:id], @author)
 
@@ -24,9 +35,7 @@ class StoriesController < ApplicationController
     @stories = Story.play_list(@comic, @author, @offset, @panel_count)
     respond_to do |format|
       format.html # index.html.erb
-      format.json {
-        render :json => '[' + @stories.map {|i| i.story_as_json(@author)}.join(',') + ']'
-      }
+      format.json {render text: Story.list_as_json_text(@stories, @author)}
       format.jsonp {
         render :json => "callback(" + @stories.to_json_list + ");"
       }