X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fcontrollers%2Fhome_controller.rb;fp=app%2Fcontrollers%2Fhome_controller.rb;h=a09252ffb7cb802798375662953d6b94992cc322;hp=8cdaa99d7e19569012b96184a961df60ecac0aaa;hb=d35ca796f1e3cf8a71c0fb574d7cdd424a779891;hpb=267a12e085f7ed00348ccf6657b89b9638156f70 diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 8cdaa99d..a09252ff 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -2,9 +2,9 @@ class HomeController < ApplicationController layout 'test' if MagicNumber['test_layout'] before_filter :authenticate_user, :only => [ :index, :show, :profile, :configure, :create_token, :delete_token, - :comics, :stories, :panels, :resource_pictures, :panel_pictures, :speech_balloons, :ground_pictures, :ground_colors + :scrolls, :scroll_panels, :comics, :stories, :story_sheets, :sheets, :sheet_panels, :panels, :resource_pictures, :panel_pictures, :speech_balloons, :ground_pictures, :ground_colors ] - before_filter :authenticate_author, :only => [:comics, :stories, :panels, :panel_pictures, :speech_balloons, :ground_pictures, :ground_colors] + before_filter :authenticate_author, :only => [:scrolls, :scroll_panels, :comics, :stories, :story_sheets, :sheets, :sheet_panels, :panels, :panel_pictures, :speech_balloons, :ground_pictures, :ground_colors] before_filter :authenticate_artist, :only => [:resource_pictures] def index @@ -40,6 +40,32 @@ class HomeController < ApplicationController end end + def scrolls + @page = Author.page params[:page] + @page_size = Author.scroll_page_size params[:page_size] + @scrolls = Scroll.mylist(@author, @page, @page_size) + + respond_to do |format| + format.html { + @paginate = Scroll.mylist_paginate(@author, @page, @page_size) + } + format.json { render json: @scrolls.to_json(Scroll.list_json_opt) } + end + end + + def scroll_panels + @page = Author.page params[:page] + @page_size = Author.scroll_panel_page_size params[:page_size] + @scroll_panels = ScrollPanel.mylist(@author, @page, @page_size) + + respond_to do |format| + format.html { + @paginate = ScrollPanel.mylist_paginate(@author, @page, @page_size) + } + format.json { render json: @scroll_panels.to_json(ScrollPanel.list_json_opt) } + end + end + def comics @page = Author.page params[:page] @page_size = Author.comic_page_size params[:page_size] @@ -62,7 +88,46 @@ class HomeController < ApplicationController format.html { @paginate = Story.mylist_paginate(@author, @page, @page_size) } - format.json { render text: Story.list_as_json_text(@stories) } + format.json { render json: @stories.to_json(Story.list_json_opt) } + end + end + + def story_sheets + @page = Author.page params[:page] + @page_size = Author.story_sheet_page_size params[:page_size] + @story_sheets = StorySheet.mylist(@author, @page, @page_size) + + respond_to do |format| + format.html { + @paginate = StorySheet.mylist_paginate(@author, @page, @page_size) + } + format.json { render json: @story_sheets.to_json(StorySheet.list_json_opt) } + end + end + + def sheets + @page = Author.page params[:page] + @page_size = Author.sheet_page_size params[:page_size] + @sheets = Sheet.mylist(@author, @page, @page_size) + + respond_to do |format| + format.html { + @paginate = Sheet.mylist_paginate(@author, @page, @page_size) + } + format.json { render json: @sheets.to_json(Sheet.list_json_opt) } + end + end + + def sheet_panels + @page = Author.page params[:page] + @page_size = Author.sheet_panel_page_size params[:page_size] + @sheet_panels = SheetPanel.mylist(@author, @page, @page_size) + + respond_to do |format| + format.html { + @paginate = SheetPanel.mylist_paginate(@author, @page, @page_size) + } + format.json { render json: @sheet_panels.to_json(SheetPanel.list_json_opt) } end end