fix leaf view

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

diff --git a/app/controllers/scrolls_controller.rb b/app/controllers/scrolls_controller.rb
index 9e72bb0..4b7d1c3 100644 (file)
--- a/app/controllers/scrolls_controller.rb
+++ b/app/controllers/scrolls_controller.rb
@@ -3,7 +3,9 @@ class ScrollsController < 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 => [:top, :index, :show, :play, :by_author, :by_panel]
+    before_filter :authenticate_reader, :only => [
+      :top, :index, :show, :play, :by_panel, :by_author, :count, :count_by_panel, :count_by_author
+    ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
@@ -26,11 +28,10 @@ class ScrollsController < ApplicationController
   
   def show_html_format format
     format.html {
-      @scroll = @item
-      if @operators.author
-        @new_panel_items = assist_items('panel', 'private')
-        #@new_panel_filer = assist_filer 'panel', @new_panel_items
-      end
+      play_list = Locmare::ListGroup.list 'scroll_panel', 'play'
+      @play_count = play_list.count(@operators, 
+        {:id => @item.id, :my_play => @item.own?(@operators)}
+      )
     }
   end
   
@@ -46,21 +47,15 @@ class ScrollsController < ApplicationController
   def play
     @item = self.class.model.show(params[:id], @operators)
     set_play
-    list_result = @list.open(@operators, 
-      {:id => params[:id], :offset => params[:offset], :count => params[:count]}
-    )
-    @items = list_result.items 
+    play_list
     respond_to do |format|
       format.html {
-        #@count = @action.list.count @item
-        #@prev_offset = @action.list.prev_offset @item
-        #@next_offset = @action.list.next_offset @item
-        if @operators.author
+        if @item.own? @operators
+          @fresh_panel_items = assist_items('panel', 'public')
           @new_panel_items = assist_items('panel', 'private')
-          #@new_panel_filer = assist_filer 'panel', @new_panel_items
         end
       }
-      format.json { render json: @items.to_json(self.class.model.list_json_opt) }
+      format.json { render json: @items.to_json }
     end
   end