From 6958b78810e08b0b69817e89eec777c1c9d9cc8a Mon Sep 17 00:00:00 2001 From: MrTob Date: Sun, 19 Jan 2025 17:33:17 +0100 Subject: [PATCH 1/4] FIX: credit card activity page change in Rows per page leads to Content missing screen --- app/views/application/_pagination.html.erb | 26 +++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/app/views/application/_pagination.html.erb b/app/views/application/_pagination.html.erb index 13da2cd901d..2f98fbc088b 100644 --- a/app/views/application/_pagination.html.erb +++ b/app/views/application/_pagination.html.erb @@ -48,16 +48,26 @@
- <%= form_with url: custom_pagy_url_for(pagy, pagy.page, current_path: current_path), - method: :get, - class: "flex items-center gap-4", - data: { controller: "auto-submit-form" } do |f| %> + <%= form_with url: defined?(@account) ? account_entries_path(account_id: @account.id) : current_path || custom_pagy_url_for(pagy, pagy.page), + method: :get, + class: "flex items-center gap-4", + data: { + controller: "auto-submit-form", + turbo_frame: (defined?(@account) ? dom_id(@account, "entries") : nil) + } do |f| %> + <% if defined?(@account) %> + <%= f.hidden_field :account_id, value: @account.id %> + <%= f.hidden_field :tab, value: params[:tab] if params[:tab].present? %> + <% if params.dig(:q, :search).present? %> + <%= f.hidden_field "q[search]", value: params.dig(:q, :search) %> + <% end %> + <% end %> <%= f.label :per_page, t(".rows_per_page"), class: "text-sm text-gray-500" %> <%= f.select :per_page, - options_for_select(["10", "20", "30", "50"], pagy.limit), - {}, - class: "py-1.5 pr-8 text-sm text-gray-900 font-medium border border-gray-200 rounded-lg focus:border-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900", - data: { "auto-submit-form-target": "auto" } %> + options_for_select(["10", "20", "30", "50"], pagy.limit), + {}, + class: "py-1.5 pr-8 text-sm text-gray-900 font-medium border border-gray-200 rounded-lg focus:border-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900", + data: { "auto-submit-form-target": "auto" } %> <% end %>
From da3221d76cad276b3e569eaa4c02fb2ccae96f27 Mon Sep 17 00:00:00 2001 From: MrTob Date: Mon, 20 Jan 2025 17:03:59 +0100 Subject: [PATCH 2/4] revert changes --- app/views/application/_pagination.html.erb | 26 +++++++--------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/app/views/application/_pagination.html.erb b/app/views/application/_pagination.html.erb index 2f98fbc088b..13da2cd901d 100644 --- a/app/views/application/_pagination.html.erb +++ b/app/views/application/_pagination.html.erb @@ -48,26 +48,16 @@
- <%= form_with url: defined?(@account) ? account_entries_path(account_id: @account.id) : current_path || custom_pagy_url_for(pagy, pagy.page), - method: :get, - class: "flex items-center gap-4", - data: { - controller: "auto-submit-form", - turbo_frame: (defined?(@account) ? dom_id(@account, "entries") : nil) - } do |f| %> - <% if defined?(@account) %> - <%= f.hidden_field :account_id, value: @account.id %> - <%= f.hidden_field :tab, value: params[:tab] if params[:tab].present? %> - <% if params.dig(:q, :search).present? %> - <%= f.hidden_field "q[search]", value: params.dig(:q, :search) %> - <% end %> - <% end %> + <%= form_with url: custom_pagy_url_for(pagy, pagy.page, current_path: current_path), + method: :get, + class: "flex items-center gap-4", + data: { controller: "auto-submit-form" } do |f| %> <%= f.label :per_page, t(".rows_per_page"), class: "text-sm text-gray-500" %> <%= f.select :per_page, - options_for_select(["10", "20", "30", "50"], pagy.limit), - {}, - class: "py-1.5 pr-8 text-sm text-gray-900 font-medium border border-gray-200 rounded-lg focus:border-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900", - data: { "auto-submit-form-target": "auto" } %> + options_for_select(["10", "20", "30", "50"], pagy.limit), + {}, + class: "py-1.5 pr-8 text-sm text-gray-900 font-medium border border-gray-200 rounded-lg focus:border-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900", + data: { "auto-submit-form-target": "auto" } %> <% end %>
From 9f838c77b41323c84c900dac40538f7146e95233 Mon Sep 17 00:00:00 2001 From: MrTob Date: Mon, 20 Jan 2025 17:18:33 +0100 Subject: [PATCH 3/4] ADD: add entry-specific partial --- .../account/entries/_pagination.html.erb | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 app/views/account/entries/_pagination.html.erb diff --git a/app/views/account/entries/_pagination.html.erb b/app/views/account/entries/_pagination.html.erb new file mode 100644 index 00000000000..4b5851211d4 --- /dev/null +++ b/app/views/account/entries/_pagination.html.erb @@ -0,0 +1,66 @@ +<%# locals: (pagy:, current_path: nil) %> + \ No newline at end of file From e5d076cb05131b2b4c3cc47b134f6b40cfd3e657 Mon Sep 17 00:00:00 2001 From: MrTob Date: Mon, 20 Jan 2025 18:20:49 +0100 Subject: [PATCH 4/4] use existing translation --- app/views/account/entries/_pagination.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/account/entries/_pagination.html.erb b/app/views/account/entries/_pagination.html.erb index 4b5851211d4..571aac22857 100644 --- a/app/views/account/entries/_pagination.html.erb +++ b/app/views/account/entries/_pagination.html.erb @@ -55,7 +55,7 @@ <% if params.dig(:q, :search).present? %> <%= f.hidden_field "q[search]", value: params.dig(:q, :search) %> <% end %> - <%= f.label :per_page, t(".rows_per_page"), class: "text-sm text-gray-500" %> + <%= f.label :per_page, t("application.pagination.rows_per_page"), class: "text-sm text-gray-500" %> <%= f.select :per_page, options_for_select(["10", "20", "30", "50"], pagy.limit), {},