t#31223:add them contents list for author and artist

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 6d4babc..3d8c537 100644 (file)
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -86,7 +86,7 @@ class HomeController < ApplicationController
   
   def panel_color
     @page = Author.page params[:page]
-    @page_size = Author.panel_colorl_page_size params[:page_size]
+    @page_size = Author.panel_color_page_size params[:page_size]
     @panel_colors = PanelColor.mylist(@author, @page, @page_size)
 
     respond_to do |format|

diff --git a/app/models/author.rb b/app/models/author.rb
index 3b56286..2281293 100644 (file)
--- a/app/models/author.rb
+++ b/app/models/author.rb
@@ -216,7 +216,7 @@ class Author < ActiveRecord::Base
   end
   
   def self.default_resource_picture_page_size
-    125
+    100
   end
   
   def self.resource_picture_max_page_size

diff --git a/app/models/resource_picture.rb b/app/models/resource_picture.rb
index dec37a0..f85e866 100644 (file)
--- a/app/models/resource_picture.rb
+++ b/app/models/resource_picture.rb
@@ -88,7 +88,7 @@ class ResourcePicture < ActiveRecord::Base
   end
   
   def self.default_page_size
-    125
+    100
   end
   
   def self.max_page_size

diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
index d3e0281..ac609e4 100644 (file)
--- a/spec/controllers/home_controller_spec.rb
+++ b/spec/controllers/home_controller_spec.rb
@@ -345,15 +345,15 @@ if MagicNumber['run_mode'] == 1
       end
       it '省略されると@page_sizeにデフォルト値が入る' do
         get :panel_color
-        assigns(:page_size).should eq PanelColor.default_page_size
+        assigns(:page_size).should eq Author.default_panel_color_page_size
       end
       it '最大を超えると@page_sizeにデフォルト最大値が入る' do
         get :panel_color, :page_size => 1500
-        assigns(:page_size).should eq PanelColor.max_page_size
+        assigns(:page_size).should eq Author.panel_color_max_page_size
       end
       it '不正な値が入ると@page_sizeにデフォルト最大値が入る' do
         get :panel_color, :page_size => 0
-        assigns(:page_size).should eq PanelColor.default_page_size
+        assigns(:page_size).should eq Author.default_panel_color_page_size
       end
     end
     context 'つつがなく終わるとき' do
@@ -446,15 +446,15 @@ if MagicNumber['run_mode'] == 1
       end
       it '省略されると@page_sizeにデフォルト値が入る' do
         get :ground_picture
-        assigns(:page_size).should eq GroundPicture.default_page_size
+        assigns(:page_size).should eq Author.default_ground_picture_page_size
       end
       it '最大を超えると@page_sizeにデフォルト最大値が入る' do
         get :ground_picture, :page_size => 1500
-        assigns(:page_size).should eq GroundPicture.max_page_size
+        assigns(:page_size).should eq Author.ground_picture_max_page_size
       end
       it '不正な値が入ると@page_sizeにデフォルト最大値が入る' do
         get :ground_picture, :page_size => 0
-        assigns(:page_size).should eq GroundPicture.default_page_size
+        assigns(:page_size).should eq Author.default_ground_picture_page_size
       end
     end
     context 'つつがなく終わるとき' do
@@ -547,15 +547,15 @@ if MagicNumber['run_mode'] == 1
       end
       it '省略されると@page_sizeにデフォルト値が入る' do
         get :ground_color
-        assigns(:page_size).should eq GroundColor.default_page_size
+        assigns(:page_size).should eq Author.default_ground_color_page_size
       end
       it '最大を超えると@page_sizeにデフォルト最大値が入る' do
         get :ground_color, :page_size => 1500
-        assigns(:page_size).should eq GroundColor.max_page_size
+        assigns(:page_size).should eq Author.ground_color_max_page_size
       end
       it '不正な値が入ると@page_sizeにデフォルト最大値が入る' do
         get :ground_color, :page_size => 0
-        assigns(:page_size).should eq GroundColor.default_page_size
+        assigns(:page_size).should eq Author.default_ground_color_page_size
       end
     end
     context 'つつがなく終わるとき' do