remove counter api

diff --git a/app/assets/javascripts/work/controllers.js.coffee.erb b/app/assets/javascripts/work/controllers.js.coffee.erb
index 0e01995..d23b2ce 100644 (file)
--- a/app/assets/javascripts/work/controllers.js.coffee.erb
+++ b/app/assets/javascripts/work/controllers.js.coffee.erb
@@ -17,12 +17,6 @@
       watch: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -65,18 +59,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
-      count_by_panel: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -123,21 +105,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_panel: {\r
-        type: 'count',\r
-      },\r
-      count_by_scroll: {\r
-        type: 'count',\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -186,18 +153,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_story: {\r
-        type: 'count',\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -244,21 +199,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_comic: {\r
-        type: 'count',\r
-      },\r
-      count_by_story: {\r
-        type: 'count',\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -313,21 +253,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_comic: {\r
-        type: 'count',\r
-      },\r
-      count_by_sheet: {\r
-        type: 'count',\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -374,21 +299,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_story: {\r
-        type: 'count',\r
-      },\r
-      count_by_sheet: {\r
-        type: 'count',\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -443,21 +353,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_story: {\r
-        type: 'count',\r
-      },\r
-      count_by_panel: {\r
-        type: 'count',\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -504,21 +399,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_sheet: {\r
-        type: 'count',\r
-      },\r
-      count_by_panel: {\r
-        type: 'count',\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -571,24 +451,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_scroll: {\r
-        type: 'count',\r
-      },\r
-      count_by_sheet: {\r
-        type: 'count',\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
-      count_by_speech_balloon_template: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -629,18 +491,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_panel: {\r
-        type: 'count',\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -678,21 +528,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_panel: {\r
-        type: 'count',\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
-      count_by_speech_balloon_template: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -736,24 +571,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
-      count_by_speech_balloon: {\r
-        type: 'count',\r
-      },\r
-      count_by_speech_balloon_template: {\r
-        type: 'count',\r
-      },\r
-      count_by_writing_format: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -797,24 +614,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
-      count_by_speech_balloon: {\r
-        type: 'count',\r
-      },\r
-      count_by_speech_balloon_template: {\r
-        type: 'count',\r
-      },\r
-      count_by_system_picture: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -846,18 +645,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_panel: {\r
-        type: 'count',\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -889,18 +676,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_panel: {\r
-        type: 'count',\r
-      },\r
-      count_by_author: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -923,12 +698,6 @@
       history: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -963,15 +732,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_artist: {\r
-        type: 'count',\r
-      },\r
     },\r
   },\r
   resource_pictures: {\r
@@ -1009,24 +769,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_original_picture: {\r
-        type: 'count',\r
-      },\r
-      count_by_license_group: {\r
-        type: 'count',\r
-      },\r
-      count_by_license: {\r
-        type: 'count',\r
-      },\r
-      count_by_artist: {\r
-        type: 'count',\r
-      },\r
     },\r
   },\r
   speech_balloon_templates: {\r
@@ -1035,6 +777,7 @@
         type: 'list',\r
         args: {\r
           param_id: 'none',\r
+          max_page_size: -1,\r
         },\r
       },\r
       by_panel: {\r
@@ -1052,15 +795,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_panel: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -1084,6 +818,7 @@
         type: 'list',\r
         args: {\r
           param_id: 'none',\r
+          max_page_size: -1,\r
         },\r
       },\r
       by_system_picture: {\r
@@ -1095,15 +830,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_system_picture: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -1127,6 +853,7 @@
         type: 'list',\r
         args: {\r
           param_id: 'none',\r
+          max_page_size: -1,\r
         },\r
       },\r
       by_resource_picture: {\r
@@ -1138,15 +865,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_resource_picture: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -1170,6 +888,7 @@
         type: 'list',\r
         args: {\r
           param_id: 'none',\r
+          max_page_size: -1,\r
         },\r
       },\r
       by_license_group: {\r
@@ -1187,18 +906,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
-      count_by_license_group: {\r
-        type: 'count',\r
-      },\r
-      count_by_system_picture: {\r
-        type: 'count',\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -1227,12 +934,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -1261,12 +962,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
       new: {\r
         type: 'new',\r
       },\r
@@ -1295,12 +990,6 @@
       show: {\r
         type: 'show',\r
       },\r
-      count: {\r
-        type: 'count',\r
-        args: {\r
-          action_name: 'index',\r
-        },\r
-      },\r
     },\r
   },\r
   home: {\r
@@ -1310,7 +999,6 @@
         args: {\r
           item_name: 'scroll',\r
           param_id: 'none',\r
-          counter_name: 'scrolls_count',\r
         },\r
       },\r
       scroll_panels: {\r
@@ -1318,7 +1006,6 @@
         args: {\r
           item_name: 'scroll_panel',\r
           param_id: 'none',\r
-          counter_name: 'scroll_panels_count',\r
         },\r
       },\r
       comics: {\r
@@ -1326,7 +1013,6 @@
         args: {\r
           item_name: 'comic',\r
           param_id: 'none',\r
-          counter_name: 'comics_count',\r
         },\r
       },\r
       comic_stories: {\r
@@ -1334,7 +1020,6 @@
         args: {\r
           item_name: 'comic_story',\r
           param_id: 'none',\r
-          counter_name: 'comic_stories_count',\r
         },\r
       },\r
       stories: {\r
@@ -1342,7 +1027,6 @@
         args: {\r
           item_name: 'story',\r
           param_id: 'none',\r
-          counter_name: 'stories_count',\r
         },\r
       },\r
       story_sheets: {\r
@@ -1350,7 +1034,6 @@
         args: {\r
           item_name: 'story_sheet',\r
           param_id: 'none',\r
-          counter_name: 'story_sheets_count',\r
         },\r
       },\r
       sheets: {\r
@@ -1358,7 +1041,6 @@
         args: {\r
           item_name: 'sheet',\r
           param_id: 'none',\r
-          counter_name: 'sheets_count',\r
         },\r
       },\r
       sheet_panels: {\r
@@ -1366,7 +1048,6 @@
         args: {\r
           item_name: 'sheet_panel',\r
           param_id: 'none',\r
-          counter_name: 'sheet_panels_count',\r
         },\r
       },\r
       panels: {\r
@@ -1374,7 +1055,6 @@
         args: {\r
           item_name: 'panel',\r
           param_id: 'none',\r
-          counter_name: 'panels_count',\r
         },\r
       },\r
       panel_pictures: {\r
@@ -1382,7 +1062,6 @@
         args: {\r
           item_name: 'panel_picture',\r
           param_id: 'none',\r
-          counter_name: 'panel_pictures_count',\r
         },\r
       },\r
       speech_balloons: {\r
@@ -1390,7 +1069,6 @@
         args: {\r
           item_name: 'speech_balloon',\r
           param_id: 'none',\r
-          counter_name: 'speech_balloons_count',\r
         },\r
       },\r
       speeches: {\r
@@ -1398,7 +1076,6 @@
         args: {\r
           item_name: 'speech',\r
           param_id: 'none',\r
-          counter_name: 'speeches_count',\r
         },\r
       },\r
       balloons: {\r
@@ -1406,7 +1083,6 @@
         args: {\r
           item_name: 'balloon',\r
           param_id: 'none',\r
-          counter_name: 'balloons_count',\r
         },\r
       },\r
       ground_pictures: {\r
@@ -1414,7 +1090,6 @@
         args: {\r
           item_name: 'ground_picture',\r
           param_id: 'none',\r
-          counter_name: 'ground_pictures_count',\r
         },\r
       },\r
       ground_colors: {\r
@@ -1422,7 +1097,6 @@
         args: {\r
           item_name: 'ground_color',\r
           param_id: 'none',\r
-          counter_name: 'ground_colors_count',\r
         },\r
       },\r
       original_pictures: {\r
@@ -1430,7 +1104,6 @@
         args: {\r
           item_name: 'original_picture',\r
           param_id: 'none',\r
-          counter_name: 'count',\r
         },\r
       },\r
       resource_pictures: {\r
@@ -1438,139 +1111,6 @@
         args: {\r
           item_name: 'resource_picture',\r
           param_id: 'none',\r
-          counter_name: 'resource_pictures_count',\r
-        },\r
-      },\r
-      scrolls_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'scroll',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      scroll_panels_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'scroll_panel',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      comics_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'comic',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      comic_stories_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'comic_story',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      stories_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'story',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      story_sheets_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'story_sheet',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      sheets_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'sheet',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      sheet_panels_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'sheet_panel',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      panels_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'panel',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      panel_pictures_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'panel_picture',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      speech_balloons_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'speech_balloon',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      speeches_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'speech',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      balloons_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'balloon',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      ground_pictures_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'ground_picture',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      ground_colors_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'ground_color',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      original_pictures_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'original_picture',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
-        },\r
-      },\r
-      resource_pictures_count: {\r
-        type: 'count',\r
-        args: {\r
-          item_name: 'resource_picture',\r
-          list_name: 'private',\r
-          param_id: 'none',\r
         },\r
       },\r
     },\r

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c6c83a9..dd35650 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -396,14 +396,6 @@ class ApplicationController < ActionController::Base
     end
   end
   
-  def list_count
-    set_list
-    j = {:count => @list.count()}
-    respond_to do |format|
-      format.json { render json: j.to_json }
-    end
-  end
-  
   def format_filer format
     format.html {
       @paginate = @@model.list_paginate(@page, @page_size)

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 82145f1..83257f2 100644 (file)
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -3,7 +3,9 @@ class ArtistsController < ApplicationController
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_artist, :only => [:edit, :update, :destroy]
   else
-    before_filter :authenticate_resource_reader, :only => [:index, :show, :resource_pictures]
+    before_filter :authenticate_resource_reader, :only => [
+      :index, :show, :resource_pictures
+    ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_artist, :only => [:edit, :update, :destroy]
   end
@@ -26,10 +28,6 @@ class ArtistsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/app/controllers/authors_controller.rb b/app/controllers/authors_controller.rb
index 2a3e90d..e5e5c46 100644 (file)
--- a/app/controllers/authors_controller.rb
+++ b/app/controllers/authors_controller.rb
@@ -3,7 +3,7 @@ class AuthorsController < ApplicationController
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update]
     before_filter :authenticate_author, :only => [:edit, :update]
   else
-    before_filter :authenticate_reader, :only => [:index, :show, :count]
+    before_filter :authenticate_reader, :only => [:index, :show]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update]
     before_filter :authenticate_author, :only => [:edit, :update]
   end
@@ -26,10 +26,6 @@ class AuthorsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/app/controllers/balloons_controller.rb b/app/controllers/balloons_controller.rb
index 6a5637e..f9079cc 100644 (file)
--- a/app/controllers/balloons_controller.rb
+++ b/app/controllers/balloons_controller.rb
@@ -4,9 +4,8 @@ class BalloonsController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :count, 
-      :by_author, :by_speech_balloon, :by_speech_balloon_template, :by_system_picture, 
-      :count_by_author, :count_by_speech_balloon, :count_by_speech_balloon_template, :count_by_system_picture
+      :index, :show, 
+      :by_author, :by_speech_balloon, :by_speech_balloon_template, :by_system_picture
     ]
     before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
@@ -48,26 +47,6 @@ class BalloonsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
-  def count_by_speech_balloon
-    list_count
-  end
-  
-  def count_by_speech_balloon_template
-    list_count
-  end
-  
-  def count_by_system_picture
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/app/controllers/comic_stories_controller.rb b/app/controllers/comic_stories_controller.rb
index cbb596d..fd777ec 100644 (file)
--- a/app/controllers/comic_stories_controller.rb
+++ b/app/controllers/comic_stories_controller.rb
@@ -4,7 +4,7 @@ class ComicStoriesController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_story, :by_comic, :by_author, :count, :count_by_story, :count_by_comic, :count_by_author
+      :index, :show, :by_story, :by_comic, :by_author
     ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
@@ -34,18 +34,6 @@ class ComicStoriesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_story
-    list_count
-  end
-  
-  def count_by_comic
-    list_count
-  end
-  
   def count_by_author
     list_count
   end

diff --git a/app/controllers/comics_controller.rb b/app/controllers/comics_controller.rb
index 975288b..61f9ac4 100644 (file)
--- a/app/controllers/comics_controller.rb
+++ b/app/controllers/comics_controller.rb
@@ -4,7 +4,7 @@ class ComicsController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :play, :by_story, :by_author, :count, :count_by_story, :count_by_author
+      :index, :show, :play, :by_story, :by_author
     ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
@@ -63,18 +63,6 @@ class ComicsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_story
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/app/controllers/ground_colors_controller.rb b/app/controllers/ground_colors_controller.rb
index 78c03b4..0f031f9 100644 (file)
--- a/app/controllers/ground_colors_controller.rb
+++ b/app/controllers/ground_colors_controller.rb
@@ -4,7 +4,7 @@ class GroundColorsController < ApplicationController
     before_filter :authenticate_author, :only => []
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_panel, :by_author, :count, :count_by_panel, :count_by_author
+      :index, :show, :by_panel, :by_author
     ]
     before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
@@ -37,16 +37,4 @@ class GroundColorsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
 end

diff --git a/app/controllers/ground_pictures_controller.rb b/app/controllers/ground_pictures_controller.rb
index 05d3d5e..db7c553 100644 (file)
--- a/app/controllers/ground_pictures_controller.rb
+++ b/app/controllers/ground_pictures_controller.rb
@@ -4,7 +4,7 @@ class GroundPicturesController < ApplicationController
     before_filter :authenticate_author, :only => []
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_panel, :by_author, :count, :count_by_panel, :count_by_author
+      :index, :show, :by_panel, :by_author
     ]
     before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
@@ -37,16 +37,4 @@ class GroundPicturesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
 end

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 3ee6e97..661773b 100644 (file)
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,12 +1,14 @@
 class HomeController < ApplicationController
   before_filter :authenticate_user, :only => [
     :index, :show, :profile, :configure, :create_token, :delete_token, 
-    :scrolls, :scroll_panels, :comics, :comic_stories, :stories, :story_sheets, :sheets, :sheet_panels, :panels, :panel_pictures, :speech_balloons, :balloons, :speeches, :ground_pictures, :ground_colors,
-    :scrolls_count, :scroll_panels_count, :comics_count, :comic_stories_count, :stories_count, :story_sheets_count, :sheets_count, :sheet_panels_count, :panels_count, :resource_pictures_count, :panel_pictures_count, :speech_balloons_count, :balloons_count, :speeches_count, :ground_pictures_count, :ground_colors_count
+    :scrolls, :scroll_panels, :comics, :comic_stories, :stories, :story_sheets, 
+    :sheets, :sheet_panels, 
+    :panels, :panel_pictures, :speech_balloons, :balloons, :speeches, :ground_pictures, :ground_colors
   ]
   before_filter :authenticate_author, :only => [
-    :scrolls, :scroll_panels, :comics, :comic_stories, :stories, :story_sheets, :sheets, :sheet_panels, :panels, :panel_pictures, :speech_balloons, :balloons, :speeches, :ground_pictures, :ground_colors,
-    :scrolls_count, :scroll_panels_count, :comics_count, :comic_stories_count, :stories_count, :story_sheets_count, :sheets_count, :sheet_panels_count, :panels_count, :resource_pictures_count, :panel_pictures_count, :speech_balloons_count, :balloons_count, :speeches_count, :ground_pictures_count, :ground_colors_count
+    :scrolls, :scroll_panels, :comics, :comic_stories, :stories, :story_sheets, 
+    :sheets, :sheet_panels, 
+    :panels, :panel_pictures, :speech_balloons, :balloons, :speeches, :ground_pictures, :ground_colors
   ]
   before_filter :authenticate_artist, :only => [:resource_pictures]
   
@@ -121,64 +123,4 @@ class HomeController < ApplicationController
     filer_list
   end
   
-  def scrolls_count
-    list_count
-  end
-  
-  def scroll_panels_count
-    list_count
-  end
-  
-  def comics_count
-    list_count
-  end
-  
-  def comic_stories_count
-    list_count
-  end
-  
-  def stories_count
-    list_count
-  end
-  
-  def story_sheets_count
-    list_count
-  end
-  
-  def sheets_count
-    list_count
-  end
-  
-  def sheet_panels_count
-    list_count
-  end
-  
-  def panels_count
-    list_count
-  end
-  
-  def panel_pictures_count
-    list_count
-  end
-  
-  def balloons_count
-    list_count
-  end
-  
-  def speeches_count
-    list_count
-  end
-  
-  def ground_pictures_count
-    list_count
-  end
-  
-  def ground_colors_count
-    list_count
-  end
-  
-  def resource_pictures_count
-    list_count
-  end
-  
 end

diff --git a/app/controllers/license_groups_controller.rb b/app/controllers/license_groups_controller.rb
index 7c852cf..2b12b4a 100644 (file)
--- a/app/controllers/license_groups_controller.rb
+++ b/app/controllers/license_groups_controller.rb
@@ -2,8 +2,7 @@ class LicenseGroupsController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
   else
     before_filter :authenticate_reader, :only => [
-      :by_resource_picture, 
-      :count_by_resource_picture, 
+      :by_resource_picture
     ]
   end
   before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
@@ -31,14 +30,6 @@ class LicenseGroupsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_resource_picture
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/app/controllers/licenses_controller.rb b/app/controllers/licenses_controller.rb
index f47a145..f781d0f 100644 (file)
--- a/app/controllers/licenses_controller.rb
+++ b/app/controllers/licenses_controller.rb
@@ -1,6 +1,6 @@
 class LicensesController < ApplicationController
   before_filter :authenticate_resource_reader, :only => [
-    :by_license_group, :by_system_picture, :count_by_license_group, :count_by_system_picture
+    :by_license_group, :by_system_picture
   ]
   before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
   
@@ -40,18 +40,6 @@ class LicensesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_license_group
-    list_count
-  end
-  
-  def count_by_system_picture
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/app/controllers/original_pictures_controller.rb b/app/controllers/original_pictures_controller.rb
index 92a5ab8..db1c504 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -1,6 +1,6 @@
 #原画
 class OriginalPicturesController < ApplicationController
-  before_filter :authenticate_reader, :only => [:show, :history, :count]
+  before_filter :authenticate_reader, :only => [:show, :history]
   before_filter :authenticate_user, :only => [:index, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_artist, :only => [:index, :new, :edit, :create, :update, :destroy]
   
@@ -45,10 +45,6 @@ class OriginalPicturesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
   def new
     set_new
     respond_to do |format|

diff --git a/app/controllers/panel_pictures_controller.rb b/app/controllers/panel_pictures_controller.rb
index 5c666e0..3ae4dac 100644 (file)
--- a/app/controllers/panel_pictures_controller.rb
+++ b/app/controllers/panel_pictures_controller.rb
@@ -4,7 +4,7 @@ class PanelPicturesController < ApplicationController
     before_filter :authenticate_author, :only => []
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_panel, :by_author, :count, :count_by_panel, :count_by_author
+      :index, :show, :by_panel, :by_author
     ]
     before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
@@ -37,16 +37,4 @@ class PanelPicturesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
 end

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index 2589851..8d5d44b 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -69,26 +69,6 @@ class PanelsController < ApplicationController
       end
     end
   end
-
-  def count
-    list_count
-  end
-  
-  def count_by_scroll
-    list_count
-  end
-  
-  def count_by_sheet
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
-  def count_by_speech_balloon_template
-    list_count
-  end
   
   def new
     set_new

diff --git a/app/controllers/pictures_controller.rb b/app/controllers/pictures_controller.rb
index 497aba6..1dd8e5b 100644 (file)
--- a/app/controllers/pictures_controller.rb
+++ b/app/controllers/pictures_controller.rb
@@ -4,10 +4,12 @@ class PicturesController < ApplicationController
     before_filter :authenticate_author, :only => []
   else
     before_filter :authenticate_user, :only => []
-    before_filter :authenticate_resource_reader, :only => [:show, :credit, :search]
+    before_filter :authenticate_resource_reader, :only => [
+      :show, :credit, :search
+    ]
     before_filter :authenticate_author, :only => []
   end
-  before_filter :authenticate_admin, :only => [:index, :by_artist, :count, :count_by_artist]
+  before_filter :authenticate_admin, :only => [:index, :by_artist ]
   
   def index
     filer_list
@@ -55,12 +57,4 @@ class PicturesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_artist
-    list_count
-  end
-  
 end

diff --git a/app/controllers/resource_pictures_controller.rb b/app/controllers/resource_pictures_controller.rb
index e2ee9dd..cf5c3a5 100644 (file)
--- a/app/controllers/resource_pictures_controller.rb
+++ b/app/controllers/resource_pictures_controller.rb
@@ -4,9 +4,8 @@ class ResourcePicturesController < ApplicationController
     before_filter :authenticate_artist, :only => [:new, :create, :update, :destroy]
   else
     before_filter :authenticate_resource_reader, :only => [
-      :index, :show, :credit, :count, 
-      :by_original_picture, :by_license_group, :by_license, :by_artist, 
-      :count_by_original_picture, :count_by_license_group, :count_by_license, :count_by_artist
+      :index, :show, :credit, 
+      :by_original_picture, :by_license_group, :by_license, :by_artist
     ]
     before_filter :authenticate_user, :only => [:new, :create, :update, :destroy]
     before_filter :authenticate_artist, :only => [:new, :create, :update, :destroy]
@@ -59,26 +58,6 @@ class ResourcePicturesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_original_picture
-    list_count
-  end
-  
-  def count_by_license_group
-    list_count
-  end
-  
-  def count_by_license
-    list_count
-  end
-  
-  def count_by_artist
-    list_count
-  end
-  
   def new
     # use @item, @original_picture
     respond_to do |format|

diff --git a/app/controllers/scroll_panels_controller.rb b/app/controllers/scroll_panels_controller.rb
index 21d4d14..e0fbda4 100644 (file)
--- a/app/controllers/scroll_panels_controller.rb
+++ b/app/controllers/scroll_panels_controller.rb
@@ -4,7 +4,7 @@ class ScrollPanelsController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_panel, :by_scroll, :by_author, :play, :count, :count_by_panel, :count_by_scroll, :count_by_author, :play
+      :index, :show, :by_panel, :by_scroll, :by_author, :play :play
     ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
@@ -38,26 +38,6 @@ class ScrollPanelsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_scroll
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
-  def count_play
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/app/controllers/scrolls_controller.rb b/app/controllers/scrolls_controller.rb
index 3c88b60..0f69df7 100644 (file)
--- a/app/controllers/scrolls_controller.rb
+++ b/app/controllers/scrolls_controller.rb
@@ -55,22 +55,6 @@ class ScrollsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_play
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/app/controllers/sheet_panels_controller.rb b/app/controllers/sheet_panels_controller.rb
index 703f409..752fb28 100644 (file)
--- a/app/controllers/sheet_panels_controller.rb
+++ b/app/controllers/sheet_panels_controller.rb
@@ -4,7 +4,7 @@ class SheetPanelsController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_sheet, :by_panel, :by_author, :count, :count_by_sheet, :count_by_panel, :count_by_author
+      :index, :show, :by_sheet, :by_panel, :by_author
     ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
@@ -34,22 +34,6 @@ class SheetPanelsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_sheet
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/app/controllers/sheets_controller.rb b/app/controllers/sheets_controller.rb
index 8564d06..6114a13 100644 (file)
--- a/app/controllers/sheets_controller.rb
+++ b/app/controllers/sheets_controller.rb
@@ -4,7 +4,7 @@ class SheetsController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :play, :by_story, :by_panel, :by_author, :count, :count_by_story, :count_by_panel, :count_by_author
+      :index, :show, :play, :by_story, :by_panel, :by_author
     ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
@@ -61,22 +61,6 @@ class SheetsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_story
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
   def new
     set_new
     respond_to do |format|

diff --git a/app/controllers/speech_balloon_templates_controller.rb b/app/controllers/speech_balloon_templates_controller.rb
index 0b2d024..42b1724 100644 (file)
--- a/app/controllers/speech_balloon_templates_controller.rb
+++ b/app/controllers/speech_balloon_templates_controller.rb
@@ -3,7 +3,7 @@ class SpeechBalloonTemplatesController < ApplicationController
     before_filter :authenticate_user, :only => []
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_panel, :by_system_picture, :count, :count_by_panel, :count_by_system_picture
+      :index, :show, :by_panel, :by_system_picture
     ]
     before_filter :authenticate_user, :only => []
   end
@@ -35,18 +35,6 @@ class SpeechBalloonTemplatesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_system_picture
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/app/controllers/speech_balloons_controller.rb b/app/controllers/speech_balloons_controller.rb
index 1d1a523..3b8e400 100644 (file)
--- a/app/controllers/speech_balloons_controller.rb
+++ b/app/controllers/speech_balloons_controller.rb
@@ -4,7 +4,7 @@ class SpeechBalloonsController < ApplicationController
     before_filter :authenticate_author, :only => []
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_panel, :by_author, :by_speech_balloon_template, :count, :count_by_panel, :count_by_author, :count_by_speech_balloon_template
+      :index, :show, :by_panel, :by_author, :by_speech_balloon_template
     ]
     before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
@@ -42,20 +42,4 @@ class SpeechBalloonsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
-  def count_by_speech_balloon_template
-    list_count
-  end
-  
 end

diff --git a/app/controllers/speeches_controller.rb b/app/controllers/speeches_controller.rb
index 601444d..fb37d66 100644 (file)
--- a/app/controllers/speeches_controller.rb
+++ b/app/controllers/speeches_controller.rb
@@ -4,9 +4,8 @@ class SpeechesController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :count, 
-      :by_author, :by_speech_balloon, :by_speech_balloon_template, :by_writing_format, 
-      :count_by_author, :count_by_speech_balloon, :count_by_speech_balloon_template, :count_by_writing_format
+      :index, :show, 
+      :by_author, :by_speech_balloon, :by_speech_balloon_template, :by_writing_format 
     ]
     before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
@@ -49,26 +48,6 @@ class SpeechesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
-  def count_by_speech_balloon
-    list_count
-  end
-  
-  def count_by_speech_balloon_template
-    list_count
-  end
-  
-  def count_by_writing_format
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index 6e473f1..009c38c 100644 (file)
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -4,7 +4,7 @@ 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]
@@ -68,22 +68,6 @@ class StoriesController < ApplicationController
     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

diff --git a/app/controllers/story_sheets_controller.rb b/app/controllers/story_sheets_controller.rb
index c1b74e0..748f195 100644 (file)
--- a/app/controllers/story_sheets_controller.rb
+++ b/app/controllers/story_sheets_controller.rb
@@ -4,7 +4,7 @@ class StorySheetsController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_story, :by_sheet, :by_author, :count, :count_by_story, :count_by_sheet, :count_by_author
+      :index, :show, :by_story, :by_sheet, :by_author
     ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
@@ -34,22 +34,6 @@ class StorySheetsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_story
-    list_count
-  end
-  
-  def count_by_sheet
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/app/controllers/system_pictures_controller.rb b/app/controllers/system_pictures_controller.rb
index a0175e1..3917ca6 100644 (file)
--- a/app/controllers/system_pictures_controller.rb
+++ b/app/controllers/system_pictures_controller.rb
@@ -3,7 +3,7 @@ class SystemPicturesController < ApplicationController
     before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
   else
-    before_filter :authenticate_resource_reader, :only => [:index, :show, :count]
+    before_filter :authenticate_resource_reader, :only => [:index, :show]
     before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
   end

diff --git a/app/controllers/writing_formats_controller.rb b/app/controllers/writing_formats_controller.rb
index a6efeb6..cdb27e5 100644 (file)
--- a/app/controllers/writing_formats_controller.rb
+++ b/app/controllers/writing_formats_controller.rb
@@ -2,7 +2,9 @@ class WritingFormatsController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
     before_filter :authenticate_user, :only => []
   else
-    before_filter :authenticate_reader, :only => [:index, :by_system_picture, :show, :count, :count_by_system_picture]
+    before_filter :authenticate_reader, :only => [
+      :index, :by_system_picture, :show
+    ]
     before_filter :authenticate_user, :only => []
   end
   before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
@@ -29,14 +31,6 @@ class WritingFormatsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_system_picture
-    list_count
-  end
-  
   def new
     form_new
   end

diff --git a/config/routes.rb b/config/routes.rb
index c15a692..bbc107c 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -21,7 +21,6 @@ Pettanr::Application.routes.draw do
       get :index
       get :watch
       get :show
-      get :count
       post :create
     end
     member do
@@ -37,20 +36,15 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_author
       get :by_panel
-      get :count_by_author
-      get :count_by_panel
-      get :count_play
       get :play
       get :edit
       put :update
       delete :destroy
-      get :browse
     end
   end
   resources :scroll_panels do
@@ -60,7 +54,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
@@ -68,10 +61,6 @@ Pettanr::Application.routes.draw do
       get :by_scroll
       get :by_author
       get :play
-      get :count_by_panel
-      get :count_by_scroll
-      get :count_by_author
-      get :count_play
       get :edit
       put :update
       delete :destroy
@@ -84,14 +73,11 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_author
       get :by_story
-      get :count_by_author
-      get :count_by_story
       get :play
       get :edit
       put :update
@@ -105,16 +91,12 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_comic
       get :by_story
       get :by_author
-      get :count_by_comic
-      get :count_by_story
-      get :count_by_author
       get :edit
       put :update
       delete :destroy
@@ -127,16 +109,12 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_comic
       get :by_sheet
       get :by_author
-      get :count_by_comic
-      get :count_by_sheet
-      get :count_by_author
       get :play
       get :edit
       put :update
@@ -150,16 +128,12 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_story
       get :by_sheet
       get :by_author
-      get :count_by_story
-      get :count_by_sheet
-      get :count_by_author
       get :edit
       put :update
       delete :destroy
@@ -172,7 +146,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
@@ -183,9 +156,6 @@ Pettanr::Application.routes.draw do
       get :by_story
       get :by_panel
       get :by_author
-      get :count_by_story
-      get :count_by_panel
-      get :count_by_author
       get :play
       get :edit
       put :update
@@ -199,16 +169,12 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_sheet
       get :by_panel
       get :by_author
-      get :count_by_sheet
-      get :count_by_panel
-      get :count_by_author
       get :edit
       put :update
       delete :destroy
@@ -221,7 +187,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
@@ -229,10 +194,6 @@ Pettanr::Application.routes.draw do
       get :by_sheet
       get :by_author
       get :by_speech_balloon_template
-      get :count_by_scroll
-      get :count_by_sheet
-      get :count_by_author
-      get :count_by_speech_balloon_template
       get :catch
       get :edit
       put :update
@@ -246,14 +207,11 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_panel
       get :by_author
-      get :count_by_panel
-      get :count_by_author
       get :edit
       put :update
       delete :destroy
@@ -266,16 +224,12 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_panel
       get :by_author
       get :by_speech_balloon_template
-      get :count_by_panel
-      get :count_by_author
-      get :count_by_speech_balloon_template
       get :edit
       put :update
       delete :destroy
@@ -285,17 +239,12 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
     end
     member do
       get :by_author
       get :by_speech_balloon
       get :by_speech_balloon_template
       get :by_system_picture
-      get :count_by_author
-      get :count_by_speech_balloon
-      get :count_by_speech_balloon_template
-      get :count_by_system_picture
       get :edit
       put :update
     end
@@ -304,7 +253,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
     end
     member do
       get :by_author
@@ -312,10 +260,6 @@ Pettanr::Application.routes.draw do
       get :by_author
       get :by_speech_balloon_template
       get :by_writing_format
-      get :count_by_author
-      get :count_by_speech_balloon
-      get :count_by_speech_balloon_template
-      get :count_by_writing_format
       get :edit
       put :update
     end
@@ -327,13 +271,10 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
     end
     member do
       get :by_panel
       get :by_author
-      get :count_by_panel
-      get :count_by_author
       get :edit
       put :update
       delete :destroy
@@ -346,13 +287,10 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
     end
     member do
       get :by_panel
       get :by_author
-      get :count_by_panel
-      get :count_by_author
       get :edit
       put :update
       delete :destroy
@@ -365,7 +303,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
@@ -379,13 +316,11 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       get :credit
       get :search
     end
     member do
       get :by_artist
-      get :count_by_artist
       get :credit
     end
   end
@@ -393,20 +328,14 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       get :new
       post :create
-      get :count
     end
     member do
       get :by_original_picture
       get :by_license_group
       get :by_license
       get :by_artist
-      get :count_by_original_picture
-      get :count_by_license_group
-      get :count_by_license
-      get :count_by_artist
       delete :destroy
       get :credit
     end
@@ -415,14 +344,11 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_panel
       get :by_system_picture
-      get :count_by_system_picture
-      get :count_by_panel
       put :update
       delete :destroy
     end
@@ -431,14 +357,12 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :speeches
       get :by_system_picture
       get :speeches_count
-      get :count_by_system_picture
       put :update
       delete :destroy
     end
@@ -447,12 +371,10 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
       get :by_resource_picture
-      get :count_by_resource_picture
       put :update
       delete :destroy
     end
@@ -461,7 +383,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       get :search
       post :create
     end
@@ -470,8 +391,6 @@ Pettanr::Application.routes.draw do
       get :by_license_group
       get :by_system_picture
       get :resource_pictures_count
-      get :count_by_license_group
-      get :count_by_system_picture
       put :update
       delete :destroy
     end
@@ -483,7 +402,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
@@ -499,7 +417,6 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
       post :create
     end
     member do
@@ -512,14 +429,11 @@ Pettanr::Application.routes.draw do
     collection do
       get :index
       get :show
-      get :count
     end
     member do
       #get :balloons
       get :speech_balloon_templates
       get :licenses
-      get :speech_balloon_templates_count
-      get :licenses_count
       delete :destroy
     end
   end

diff --git a/lib/locmare/filer.rb b/lib/locmare/filer.rb
index 610f0c0..0222235 100644 (file)
--- a/lib/locmare/filer.rb
+++ b/lib/locmare/filer.rb
@@ -1,6 +1,5 @@
 require_dependency "locmare/filer/header"
 require_dependency "locmare/filer/body"
-require_dependency "locmare/filer/pager"
 module Locmare
   class Filer
     include FilerModule

diff --git a/lib/locmare/filer/pager.rb b/lib/locmare/filer/pager.rb
deleted file mode 100644 (file)
index d98b937..0000000
--- a/lib/locmare/filer/pager.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-module Locmare
-  module FilerModule
-    class Pager
-      attr :filer
-      
-      def initialize filer
-        @filer = filer
-      end
-      
-      def list_result
-        @filer.list_result
-      end
-      
-      def api_path
-        list_result.path
-      end
-      
-      def template_dir
-        @filer.template_dir + "pager/"
-      end
-      
-      def template_name
-        self.template_dir + self.template_file_name
-      end
-      
-    end
-    
-    class NonePager < Pager
-      def template_file_name
-        "none"
-      end
-      
-    end
-    
-    class DefaultPager < Pager
-      def template_file_name
-        "default"
-      end
-      
-      def paginate
-        list_result.paginate
-      end
-      
-    end
-    
-    class MorePager < Pager
-      def template_file_name
-        "more"
-      end
-      
-    end
-    
-  end
-end

diff --git a/lib/locmare/list_group/lib/page_status.rb b/lib/locmare/list_group/lib/page_status.rb
index ee726b9..0c58d0a 100644 (file)
--- a/lib/locmare/list_group/lib/page_status.rb
+++ b/lib/locmare/list_group/lib/page_status.rb
@@ -187,6 +187,7 @@ module Locmare
         end
         
         def self.load list, total, options
+          return nil if total == 0
           ps = if self.offset(options) or self.count(options)
             Offset.new list, total, options
           else

diff --git a/lib/locmare/list_group/list/base.rb b/lib/locmare/list_group/list/base.rb
index e899fd4..e9fbbc9 100644 (file)
--- a/lib/locmare/list_group/list/base.rb
+++ b/lib/locmare/list_group/list/base.rb
@@ -92,6 +92,7 @@ module Locmare
       end
       
       def items
+        return [] unless @page_status
         @items ||= @model.where(
           self.where_condition
         ).includes(

diff --git a/lib/locmare/list_group/list/filter.rb b/lib/locmare/list_group/list/filter.rb
index 1e8d69c..97200dd 100644 (file)
--- a/lib/locmare/list_group/list/filter.rb
+++ b/lib/locmare/list_group/list/filter.rb
@@ -33,32 +33,6 @@ module Locmare
         r
       end
       
-      def items
-        if self.visible?
-          @model.where(
-            self.where_condition
-          ).includes(
-            self.include_hash
-          ).order(
-            self.order_by
-          ).offset(@offset).limit(@limit)
-        else
-          []
-        end
-      end
-      
-      def count
-        if self.visible?
-          @model.where(
-            self.where_condition
-          ).includes(
-            self.include_hash
-          ).count
-        else
-          0
-        end
-      end
-      
     end
     
   end

diff --git a/lib/locmare/profiler/association/has_many.rb b/lib/locmare/profiler/association/has_many.rb
index e611743..e887d4a 100644 (file)
--- a/lib/locmare/profiler/association/has_many.rb
+++ b/lib/locmare/profiler/association/has_many.rb
@@ -25,7 +25,7 @@ module Locmare
           )
           ::Locmare::Filer.new(
             self.has_many_model.item_name, list.items, 
-            list.page_status, self.profiler.operators
+            nil, self.profiler.operators
           )
         end
         

diff --git a/lib/manifest/controller/action.rb b/lib/manifest/controller/action.rb
index 33acd58..81e88a6 100644 (file)
--- a/lib/manifest/controller/action.rb
+++ b/lib/manifest/controller/action.rb
@@ -1,5 +1,5 @@
 ManifestBase.require_modules "manifest/controller/action/", 
-  %w|base list show count new edit create update destroy|
+  %w|base list show new edit create update destroy|
 
 module Manifest
   module ControllerModule
@@ -8,7 +8,7 @@ module Manifest
       
       def self.types
         {
-          'list' => ActionList, 'show' => ActionShow, 'count' => ActionCount, 
+          'list' => ActionList, 'show' => ActionShow, 
           'new' => ActionNew, 'edit' => ActionEdit, 
           'create' => ActionCreate, 'update' => ActionUpdate, 'destroy' => ActionDestroy
         }

diff --git a/lib/manifest/controller/action/count.rb b/lib/manifest/controller/action/count.rb
deleted file mode 100644 (file)
index 189d69e..0000000
--- a/lib/manifest/controller/action/count.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Manifest
-  module ControllerModule
-    module ActionModule
-      class ActionCount < Base
-        attr :alias
-        
-        def set_default
-          super
-          @args['action_name'] ||= @name.gsub(/^count_/, '')
-        end
-        
-        def init
-          super
-          @action_name = @args['action_name']
-        end
-        
-      end
-      
-    end
-  end
-end

diff --git a/lib/manifest/controller/action/list.rb b/lib/manifest/controller/action/list.rb
index 0475a49..3a54483 100644 (file)
--- a/lib/manifest/controller/action/list.rb
+++ b/lib/manifest/controller/action/list.rb
@@ -18,15 +18,6 @@ module Manifest
           @direction = @args['direction'].to_i
           @default_page_size = @args['default_page_size']
           @max_page_size = @args['max_page_size']
-          @counter_name = if @args['counter_name']
-            @args['counter_name']
-          else
-            if @name == 'index'
-              'count'
-            else
-              'count_' + @name
-            end
-          end
         end
         
         def alias_action
@@ -35,11 +26,6 @@ module Manifest
           c.actions[s[1]]
         end
         
-        def counter_url params
-          action_manifest = @parent.actions[@counter_name]
-          self.encode_url(params)
-        end
-        
       end
       
     end

diff --git a/lib/manifest/system_resource.rb b/lib/manifest/system_resource.rb
index b765146..120902a 100644 (file)
--- a/lib/manifest/system_resource.rb
+++ b/lib/manifest/system_resource.rb
@@ -44,11 +44,10 @@ module Manifest
               resource_controller_name, 
               resource_action_name, 
               nil, 
-              {}  # set no limit options
+              {:page_size => -1}  # set no limit options
             )
-            r = list.open nil
             @select_items[source_manifest.select_item_name] = 
-              r.items.map {|item| [item.attributes[caption], item.id]}
+              list.items.map {|item| [item.attributes[caption], item.id]}
           rescue
             puts 'skip store select_items:' + resource_item_name + '.' + resource_action_name
           end

diff --git a/public/manifest.json b/public/manifest.json
index fdb3624..da1b7f7 100644 (file)
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -254,12 +254,6 @@
         "watch": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -302,18 +296,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
-        "count_by_panel": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -360,21 +342,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_panel": {\r
-          "type": "count"\r
-        },\r
-        "count_by_scroll": {\r
-          "type": "count"\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -423,18 +390,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_story": {\r
-          "type": "count"\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -481,21 +436,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_comic": {\r
-          "type": "count"\r
-        },\r
-        "count_by_story": {\r
-          "type": "count"\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -550,21 +490,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_comic": {\r
-          "type": "count"\r
-        },\r
-        "count_by_sheet": {\r
-          "type": "count"\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -611,21 +536,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_story": {\r
-          "type": "count"\r
-        },\r
-        "count_by_sheet": {\r
-          "type": "count"\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -680,21 +590,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_story": {\r
-          "type": "count"\r
-        },\r
-        "count_by_panel": {\r
-          "type": "count"\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -741,21 +636,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_sheet": {\r
-          "type": "count"\r
-        },\r
-        "count_by_panel": {\r
-          "type": "count"\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -808,24 +688,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_scroll": {\r
-          "type": "count"\r
-        },\r
-        "count_by_sheet": {\r
-          "type": "count"\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
-        "count_by_speech_balloon_template": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -866,18 +728,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_panel": {\r
-          "type": "count"\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -915,21 +765,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_panel": {\r
-          "type": "count"\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
-        "count_by_speech_balloon_template": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -973,24 +808,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
-        "count_by_speech_balloon": {\r
-          "type": "count"\r
-        },\r
-        "count_by_speech_balloon_template": {\r
-          "type": "count"\r
-        },\r
-        "count_by_writing_format": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -1034,24 +851,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
-        "count_by_speech_balloon": {\r
-          "type": "count"\r
-        },\r
-        "count_by_speech_balloon_template": {\r
-          "type": "count"\r
-        },\r
-        "count_by_system_picture": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -1083,18 +882,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_panel": {\r
-          "type": "count"\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -1126,18 +913,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_panel": {\r
-          "type": "count"\r
-        },\r
-        "count_by_author": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -1160,12 +935,6 @@
         "history": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -1199,15 +968,6 @@
         },\r
         "show": {\r
           "type": "show"\r
-        },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_artist": {\r
-          "type": "count"\r
         }\r
       }\r
     },\r
@@ -1245,24 +1005,6 @@
         },\r
         "show": {\r
           "type": "show"\r
-        },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_original_picture": {\r
-          "type": "count"\r
-        },\r
-        "count_by_license_group": {\r
-          "type": "count"\r
-        },\r
-        "count_by_license": {\r
-          "type": "count"\r
-        },\r
-        "count_by_artist": {\r
-          "type": "count"\r
         }\r
       }\r
     },\r
@@ -1271,7 +1013,8 @@
         "index": {\r
           "type": "list",\r
           "args": {\r
-            "param_id": "none"\r
+            "param_id": "none",\r
+            "max_page_size": -1\r
           }\r
         },\r
         "by_panel": {\r
@@ -1289,15 +1032,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_panel": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -1320,7 +1054,8 @@
         "index": {\r
           "type": "list",\r
           "args": {\r
-            "param_id": "none"\r
+            "param_id": "none",\r
+            "max_page_size": -1\r
           }\r
         },\r
         "by_system_picture": {\r
@@ -1332,15 +1067,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_system_picture": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -1363,7 +1089,8 @@
         "index": {\r
           "type": "list",\r
           "args": {\r
-            "param_id": "none"\r
+            "param_id": "none",\r
+            "max_page_size": -1\r
           }\r
         },\r
         "by_resource_picture": {\r
@@ -1375,15 +1102,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_resource_picture": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -1406,7 +1124,8 @@
         "index": {\r
           "type": "list",\r
           "args": {\r
-            "param_id": "none"\r
+            "param_id": "none",\r
+            "max_page_size": -1\r
           }\r
         },\r
         "by_license_group": {\r
@@ -1424,18 +1143,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
-        "count_by_license_group": {\r
-          "type": "count"\r
-        },\r
-        "count_by_system_picture": {\r
-          "type": "count"\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -1464,12 +1171,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -1498,12 +1199,6 @@
         "show": {\r
           "type": "show"\r
         },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
-        },\r
         "new": {\r
           "type": "new"\r
         },\r
@@ -1531,12 +1226,6 @@
         },\r
         "show": {\r
           "type": "show"\r
-        },\r
-        "count": {\r
-          "type": "count",\r
-          "args": {\r
-            "action_name": "index"\r
-          }\r
         }\r
       }\r
     },\r
@@ -1546,267 +1235,118 @@
           "type": "list",\r
           "args": {\r
             "item_name": "scroll",\r
-            "param_id": "none",\r
-            "counter_name": "scrolls_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "scroll_panels": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "scroll_panel",\r
-            "param_id": "none",\r
-            "counter_name": "scroll_panels_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "comics": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "comic",\r
-            "param_id": "none",\r
-            "counter_name": "comics_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "comic_stories": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "comic_story",\r
-            "param_id": "none",\r
-            "counter_name": "comic_stories_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "stories": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "story",\r
-            "param_id": "none",\r
-            "counter_name": "stories_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "story_sheets": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "story_sheet",\r
-            "param_id": "none",\r
-            "counter_name": "story_sheets_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "sheets": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "sheet",\r
-            "param_id": "none",\r
-            "counter_name": "sheets_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "sheet_panels": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "sheet_panel",\r
-            "param_id": "none",\r
-            "counter_name": "sheet_panels_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "panels": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "panel",\r
-            "param_id": "none",\r
-            "counter_name": "panels_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "panel_pictures": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "panel_picture",\r
-            "param_id": "none",\r
-            "counter_name": "panel_pictures_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "speech_balloons": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "speech_balloon",\r
-            "param_id": "none",\r
-            "counter_name": "speech_balloons_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "speeches": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "speech",\r
-            "param_id": "none",\r
-            "counter_name": "speeches_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "balloons": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "balloon",\r
-            "param_id": "none",\r
-            "counter_name": "balloons_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "ground_pictures": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "ground_picture",\r
-            "param_id": "none",\r
-            "counter_name": "ground_pictures_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "ground_colors": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "ground_color",\r
-            "param_id": "none",\r
-            "counter_name": "ground_colors_count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "original_pictures": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "original_picture",\r
-            "param_id": "none",\r
-            "counter_name": "count"\r
+            "param_id": "none"\r
           }\r
         },\r
         "resource_pictures": {\r
           "type": "list",\r
           "args": {\r
             "item_name": "resource_picture",\r
-            "param_id": "none",\r
-            "counter_name": "resource_pictures_count"\r
-          }\r
-        },\r
-        "scrolls_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "scroll",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "scroll_panels_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "scroll_panel",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "comics_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "comic",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "comic_stories_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "comic_story",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "stories_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "story",\r
-            "list_name": "private",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "story_sheets_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "story_sheet",\r
-            "list_name": "private",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "sheets_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "sheet",\r
-            "list_name": "private",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "sheet_panels_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "sheet_panel",\r
-            "list_name": "private",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "panels_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "panel",\r
-            "list_name": "private",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "panel_pictures_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "panel_picture",\r
-            "list_name": "private",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "speech_balloons_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "speech_balloon",\r
-            "list_name": "private",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "speeches_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "speech",\r
-            "list_name": "private",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "balloons_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "balloon",\r
-            "list_name": "private",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "ground_pictures_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "ground_picture",\r
-            "list_name": "private",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "ground_colors_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "ground_color",\r
-            "list_name": "private",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "original_pictures_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "original_picture",\r
-            "list_name": "private",\r
-            "param_id": "none"\r
-          }\r
-        },\r
-        "resource_pictures_count": {\r
-          "type": "count",\r
-          "args": {\r
-            "item_name": "resource_picture",\r
-            "list_name": "private",\r
             "param_id": "none"\r
           }\r
         }\r