X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fcomics_controller.rb;fp=app%2Fcontrollers%2Fcomics_controller.rb;h=975288b0b0fb18ad15af27d296d8dc320ea8eb90;hb=665761e56525215946e2547a70c82c603d5047af;hp=3ef277ef020b800c651cb4c5e67ae49642d18dad;hpb=337b932677eb676636fd5fa6ec6e4070cb63fde1;p=pettanr%2Fpettanr.git diff --git a/app/controllers/comics_controller.rb b/app/controllers/comics_controller.rb index 3ef277ef..975288b0 100644 --- a/app/controllers/comics_controller.rb +++ b/app/controllers/comics_controller.rb @@ -9,10 +9,6 @@ class ComicsController < ApplicationController before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy] before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy] end - - def self.model - Comic - end def index filer_list @@ -28,10 +24,11 @@ class ComicsController < ApplicationController def show_html_format format format.html { - play_list = Locmare::ListGroup.list 'comic_story', 'play' - @play_count = play_list.count(@operators, + play_list = Locmare::ListGroup.list( + 'comic_stories', 'by_comic', @operators, {:id => @item.id, :my_play => @item.own?(@operators)} ) + @play_count = play_list.count(@operators) } end @@ -47,18 +44,19 @@ class ComicsController < ApplicationController end def play - @item = self.class.model.show(params[:id], @operators) set_play - @items = @list.items(@operators, - {:id => params[:id], :my_play => @item.own?(@operators)}, - 0, -1 # no limit + @list = Locmare::ListGroup.list( + @my_controller.name, + @my_action.name, @operators, + {:id => @item.id, :offset => 0, :limit => -1}# no limit ) - @count = @items.count + @items = @list.items(@operators) + @count = @list.count @operators # no pager respond_to do |format| format.html { if @item.own? @operators - @new_story_items = assist_items('story', 'private') + @new_story_items = assist_items('home', 'stories') end } format.json { render json: @items.to_json }