diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb index 0c569d96..98be1c39 100644 --- a/app/controllers/transactions_controller.rb +++ b/app/controllers/transactions_controller.rb @@ -6,7 +6,7 @@ class TransactionsController < ApplicationController def index @q = search_params result = Current.family.transactions.search(@q).ordered - @pagy, @transactions = pagy(result, items: 50) + @pagy, @transactions = pagy(result, items: params[:per_page] || "10") @totals = { count: result.select { |t| t.currency == Current.family.currency }.count, diff --git a/app/views/layouts/with_sidebar.html.erb b/app/views/layouts/with_sidebar.html.erb index f014dd66..ca824d45 100644 --- a/app/views/layouts/with_sidebar.html.erb +++ b/app/views/layouts/with_sidebar.html.erb @@ -7,7 +7,7 @@ <%= render "layouts/sidebar" %> <% end %> -
+
<%= yield %>
diff --git a/app/views/transactions/_pagination.html.erb b/app/views/transactions/_pagination.html.erb index 2ad3149a..a485ce71 100644 --- a/app/views/transactions/_pagination.html.erb +++ b/app/views/transactions/_pagination.html.erb @@ -1,39 +1,56 @@ -