From 957ab330f742e5a76c50a6ad9effacbe85c90cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= Date: Sat, 5 Mar 2022 21:41:58 +0800 Subject: [PATCH] fix error --- app/controllers/admin/universal_tables_controller.rb | 4 +++- app/models/table_entry.rb | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/universal_tables_controller.rb b/app/controllers/admin/universal_tables_controller.rb index 202f16a..ad2f496 100644 --- a/app/controllers/admin/universal_tables_controller.rb +++ b/app/controllers/admin/universal_tables_controller.rb @@ -271,7 +271,9 @@ class Admin::UniversalTablesController < OrbitAdminController column.each do |c| columns = (columns | c.column_entries.any_of(:"text.en" => regex).or(:"text.zh_tw" => regex).or(:"content.en" => regex).or(:"content.zh_tw" => regex)) end - columns = Kaminari.paginate_array(columns,limit: columns.count) + columns_count = columns.count + columns_count = 1 if columns_count==0 + columns = Kaminari.paginate_array(columns,limit: columns_count) entries = TableEntry.where(:u_table_id=>table.id).sorting(params: params,table: table,column_entries: columns,page_num: params[:page],per: 10) end diff --git a/app/models/table_entry.rb b/app/models/table_entry.rb index dddbe92..b147b1c 100644 --- a/app/models/table_entry.rb +++ b/app/models/table_entry.rb @@ -55,7 +55,11 @@ class TableEntry if direction == 'desc' values = values.reverse end - values = Kaminari.paginate_array(values,limit: values.count) + if paginated || !per.nil? + values_count = values.count + values_count = 1 if values_count==0 + values = Kaminari.paginate_array(values,limit: values_count) + end end if !per.nil? values = values.page(page_num).per(per)