fix select item translation

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

diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index 976ec15..22a4b19 100644 (file)
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -4,15 +4,11 @@ class StoriesController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :play, :by_comic, :by_sheet, :by_author, :count, :count_by_comic, :count_by_sheet, :count_by_author
+      :index, :show, :play, :by_comic, :by_sheet, :by_author
     ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
-
-  def self.model
-    Story
-  end
   
   def index
     filer_list
@@ -32,9 +28,9 @@ class StoriesController < ApplicationController
   
   def show_html_format format
     format.html {
-      play_list = Locmare::ListGroup.list 'story_sheet', 'play'
-      @play_count = play_list.count(@operators, 
-        {:id => @item.id, :my_play => @item.own?(@operators)}
+      @play_list = Locmare::ListGroup.list(
+        'story_sheets', 'by_story', @operators, 
+        {:id => @item.id, :page_size => -1}  # set no limit options
       )
     }
   end
@@ -49,43 +45,21 @@ class StoriesController < ApplicationController
   end
   
   def play
-    params[:offset] = nil
-    params[:count] = nil
-    params[:page] ||= 1
-    params[:page_size] = 1
-    @item = self.class.model.show(params[:id], @operators)
     set_play
+    @list.options.merge!({'per_page' => 1})    # show one sheet
+    @list.reset
     play_list
-    @sort_items = @list.items(@operators, 
-      {:id => params[:id], :my_play => @item.own?(@operators)},
-      0, -1 # no limit
-    )
     respond_to do |format|
       format.html {
+        @pager = @list.page_status.pager
         if @item.own? @operators
-          @new_sheet_items = assist_items('sheet', 'private')
+          @new_sheet_items = assist_items('home', 'sheets')
         end
       }
-      format.json { render json: @items.to_json }
+      list_json_format @list, format
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_comic
-    list_count
-  end
-  
-  def count_by_sheet
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
   def new
     form_new
   end