make sure page parameter is a hash. #181

datacite · Jan 9, 2019 · 7bab293 · 7bab293
1 parent f66f395
commit 7bab293
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/app/controllers/client_prefixes_controller.rb b/app/controllers/client_prefixes_controller.rb
@@ -36,7 +36,7 @@ def index
     end
 
     # pagination
-    page = params[:page] || {}
+    page = params[:page].is_a?(Hash) ? params[:page] : {}
     page[:number] = page[:number] && page[:number].to_i > 0 ? page[:number].to_i : 1
     page[:size] = page[:size] && (1..1000).include?(page[:size].to_i) ? page[:size].to_i : 25
     total = collection.count

diff --git a/app/controllers/clients_controller.rb b/app/controllers/clients_controller.rb
@@ -16,7 +16,7 @@ def index
            else { "name.raw" => { order: 'asc' }}
            end
 
-    page = params[:page] || {}
+    page = params[:page].is_a?(Hash) ? params[:page] : {}
     if page[:size].present? 
       page[:size] = [page[:size].to_i, 1000].min
       max_number = page[:size] > 0 ? 10000/page[:size] : 1

diff --git a/app/controllers/data_centers_controller.rb b/app/controllers/data_centers_controller.rb
@@ -12,7 +12,7 @@ def index
            else { "name.raw" => { order: 'asc' }}
            end
 
-    page = params[:page] || {}
+    page = params[:page].is_a?(Hash) ? params[:page] : {}
     if page[:size].present? 
       page[:size] = [page[:size].to_i, 1000].min
       max_number = 1

diff --git a/app/controllers/dois_controller.rb b/app/controllers/dois_controller.rb
@@ -95,7 +95,7 @@ def index
           else { updated: { order: 'desc' }}
           end
 
-    page = params[:page] || {}
+    page = params[:page].is_a?(Hash) ? params[:page] : {}
 
     if page[:size].present?
       page[:size] = [page[:size].to_i, 1000].min

diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb
@@ -8,7 +8,7 @@ def index
     collection = @doi.media
     total = @doi.cached_media_count.reduce(0) { |sum, d| sum + d[:count].to_i }
 
-    page = params[:page] || {}
+    page = params[:page].is_a?(Hash) ? params[:page] : {}
     page[:number] = page[:number] && page[:number].to_i > 0 ? page[:number].to_i : 1
     page[:size] = page[:size] && (1..1000).include?(page[:size].to_i) ? page[:size].to_i : 25
     total_pages = (total.to_f / page[:size]).ceil

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
@@ -11,7 +11,7 @@ def index
            else { "name.raw" => { order: 'asc' }}
            end
 
-    page = params[:page] || {}
+    page = params[:page].is_a?(Hash) ? params[:page] : {}
     if page[:size].present? 
       page[:size] = [page[:size].to_i, 1000].min
       max_number = 1

diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
@@ -11,7 +11,7 @@ def index
     collection = @doi.metadata
     total = @doi.cached_metadata_count.reduce(0) { |sum, d| sum + d[:count].to_i }
 
-    page = params[:page] || {}
+    page = params[:page].is_a?(Hash) ? params[:page] : {}
     page[:number] = page[:number] && page[:number].to_i > 0 ? page[:number].to_i : 1
     page[:size] = page[:size] && (1..1000).include?(page[:size].to_i) ? page[:size].to_i : 25
     total_pages = (total.to_f / page[:size]).ceil

diff --git a/app/controllers/prefixes_controller.rb b/app/controllers/prefixes_controller.rb
@@ -67,7 +67,7 @@ def index
     end
 
     # pagination
-    page = params[:page] || {}
+    page = params[:page].is_a?(Hash) ? params[:page] : {}
     page[:number] = page[:number] && page[:number].to_i > 0 ? page[:number].to_i : 1
     page[:size] = page[:size] && (1..1000).include?(page[:size].to_i) ? page[:size].to_i : 25
     total = collection.count

diff --git a/app/controllers/provider_prefixes_controller.rb b/app/controllers/provider_prefixes_controller.rb
@@ -66,7 +66,7 @@ def index
     end
 
     # pagination
-    page = params[:page] || {}
+    page = params[:page].is_a?(Hash) ? params[:page] : {}
     page[:number] = page[:number] && page[:number].to_i > 0 ? page[:number].to_i : 1
     page[:size] = page[:size] && (1..1000).include?(page[:size].to_i) ? page[:size].to_i : 25
     total = collection.count

diff --git a/app/controllers/providers_controller.rb b/app/controllers/providers_controller.rb
@@ -15,7 +15,7 @@ def index
            else { "name.raw" => { order: 'asc' }}
            end
 
-    page = params[:page] || {}
+    page = params[:page].is_a?(Hash) ? params[:page] : {}
     if page[:size].present? 
       page[:size] = [page[:size].to_i, 1000].min
       max_number = page[:size] > 0 ? 10000/page[:size] : 1

diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb
@@ -18,7 +18,7 @@ def index
           else { updated: { order: 'desc' }}
           end
 
-    page = params[:page] || {}
+    page = params[:page].is_a?(Hash) ? params[:page] : {}
     if page[:size].present?
       page[:size] = [page[:size].to_i, 1000].min
       max_number = page[:size] > 0 ? 10000/page[:size] : 1