temp

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

diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index 96a1fda..c828287 100644 (file)
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -4,50 +4,58 @@ class StoriesController < ApplicationController
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
-    before_filter :authenticate_reader, :only => [:index, :show, :comic]
+    before_filter :authenticate_reader, :only => [:index, :show, :play]
     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]
 
+  @@model = Story
   def index
-    @page = Story.page params[:page]
-    @page_size = Story.page_size params[:page_size]
-    @stories = Story.list(@page, @page_size)
+    set_filer
 
     respond_to do |format|
-      format.html {
-        @paginate = Story.list_paginate(@page, @page_size)
-      }
-      format.json { render :json => @stories.to_json(Story.list_json_opt) }
+      format_filer format
+      format.json { render json: @items.to_json(@@model.list_json_opt) }
     end
   end
 
   def show
-    @story = Story.show(params[:id], [@user, @admin])
+    @item = Story.show(params[:id], @operators)
 
     respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @story.story_as_json(@author) }
+      format.html { 
+        @story = @item
+        if @operators.author
+          @new_sheets = Sheet.mylist(@operators.author, 1, 5)
+        end
+      }
+      format_prof format
+      format.json { render json: @item.to_json(Story.show_json_opt) }
     end
   end
   
-  def comic
-    @comic = Comic.show(params[:id], [@user, @admin])
-    cnt = Story.count(:conditions => ['comic_id = ?', @comic.id]).to_i
-    @offset = Story.offset cnt, params[:offset]
-    @panel_count = Story.panel_count cnt, params[:count]
-    @stories = Story.play_list(@comic, @author, @offset, @panel_count)
+  def play
+    @story = Story.show(params[:id], [@user, @admin])
+    @page = StorySheet.page params[:page]
+    @sheet = StorySheet.play_sheet(@story, @author, @page)
     respond_to do |format|
       format.html {
-        @paginate = Story.play_list_paginate(@comic, @offset, @panel_count)
+        @paginate = StorySheet.play_paginate(@story, @page)
         if @author
-          @new_panels = Panel.mylist(@author, 0, 5)
+          @new_sheets = Sheet.mylist(@author, 1, 5)
+        end
+      }
+      format.json {
+        if @sheet
+          @story_sheets = SheetPanel.play_list @sheet, @author
+          render text: SheetPanel.list_as_json_text(@story_sheets, @author)
+        else
+          render text: ''
         end
       }
-      format.json {render text: Story.list_as_json_text(@stories, @author)}
       format.jsonp {
-        render :json => "callback(" + @stories.to_json_list + ");"
+        render :json => "callback(" + @story_sheets.to_json_list + ");"
       }
     end
   end
@@ -76,7 +84,7 @@ class StoriesController < ApplicationController
     respond_to do |format|
       format.html # new.html.erb
       format.js
-      format.json { render json: @story.story_as_json(@author) }
+      format.json { render json: @story.to_json(Story.show_json_opt) }
     end
   end
 
@@ -92,16 +100,16 @@ class StoriesController < ApplicationController
     @story = Story.new 
     @story.supply_default
     @story.attributes = params[:story]
-    @story.overwrite @author
+    @story.overwrite
     @comic = Comic.edit(@story.comic_id, @author) if @story.comic_id
-    @panel = Panel.show(@story.panel_id, @author) if @story.panel_id
     
     respond_to do |format|
-      if @story.store
+      if @story.store @author
         flash[:notice] = I18n.t('flash.notice.created', :model => Story.model_name.human)
-        format.html { redirect_to action: :comic, id: @story.comic_id }
-        format.json { render json: @story.story_as_json(@author) }
+        format.html { redirect_to play_story_path(@story, :page => @story.t.to_i + 1) }
+        format.json { render json: @story.to_json(Story.show_json_opt) }
       else
+        flash[:notice] = I18n.t('flash.notice.not_created', :model => Story.model_name.human)
         format.html { render action: "new" }
         format.json { render json: @story.errors, status: :unprocessable_entity }
       end
@@ -112,13 +120,14 @@ class StoriesController < ApplicationController
     @story = Story.edit(params[:id], @author)
     ot = @story.t
     @story.attributes = params[:story]
-    @story.overwrite @author
+    @story.overwrite
     respond_to do |format|
-      if @story.store ot
+      if @story.store  @author, ot
         flash[:notice] = I18n.t('flash.notice.updated', :model => Story.model_name.human)
-        format.html { redirect_to action: :comic, id: @story.comic_id }
+        format.html { redirect_to play_story_path(@story, :page => @story.t.to_i + 1) }
         format.json { head :ok }
       else
+        flash[:notice] = I18n.t('flash.notice.not_updated', :model => Story.model_name.human)
         format.html { render action: "edit" }
         format.json { render json: @story.errors, status: :unprocessable_entity }
       end
@@ -130,7 +139,7 @@ class StoriesController < ApplicationController
     respond_to do |format|
       if @story.destroy_and_shorten
         flash[:notice] = I18n.t('flash.notice.destroyed', :model => Story.model_name.human)
-        format.html { redirect_to :controller => 'stories', :action => :comic, :id => @story.comic_id }
+        format.html { redirect_to comic_path(@story.comic)}
         format.json { head :ok }
       else
         flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => Story.model_name.human)