From 7761b82ec80e261615d6ea3fa151f26a49f11533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Fri, 21 Apr 2023 23:34:58 +0200 Subject: [PATCH 1/2] fix: avoid removing index if it doesn't exist (#73) --- ...30421151548_remove_token_and_question_index_from_receipts.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20230421151548_remove_token_and_question_index_from_receipts.rb b/db/migrate/20230421151548_remove_token_and_question_index_from_receipts.rb index 490d79d..744e74c 100644 --- a/db/migrate/20230421151548_remove_token_and_question_index_from_receipts.rb +++ b/db/migrate/20230421151548_remove_token_and_question_index_from_receipts.rb @@ -2,6 +2,6 @@ class RemoveTokenAndQuestionIndexFromReceipts < ActiveRecord::Migration[7.0] def change - remove_index :receipts, name: 'index_receipts_on_token_id_and_question_id' + remove_index :receipts, name: 'index_receipts_on_token_id_and_question_id' if index_exists?(:receipts, name: 'index_receipts_on_token_id_and_question_id') end end From e5029c020c0237c3371f056267b0259edda4340d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= Date: Sat, 22 Apr 2023 09:00:05 +0200 Subject: [PATCH 2/2] fix: remove User#to_hash call in magic link template (#74) --- app/views/sessions_mailer/user_magic_link_email.text.erb | 2 +- ...30421151548_remove_token_and_question_index_from_receipts.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/sessions_mailer/user_magic_link_email.text.erb b/app/views/sessions_mailer/user_magic_link_email.text.erb index 4bcbec4..df3185c 100644 --- a/app/views/sessions_mailer/user_magic_link_email.text.erb +++ b/app/views/sessions_mailer/user_magic_link_email.text.erb @@ -1,6 +1,6 @@ <%= t('application_mailer.greeting') %>, <%= t('sessions_mailer.user_magic_link_email.body', - magic_link_url: magic_link_url(@token.to_hash)).strip %> + magic_link_url: magic_link_url(@voter_hash)).strip %> <%= t('application_mailer.complimentary_close', recipient: Rails.configuration.x.asembleo.title).strip %> \ No newline at end of file diff --git a/db/migrate/20230421151548_remove_token_and_question_index_from_receipts.rb b/db/migrate/20230421151548_remove_token_and_question_index_from_receipts.rb index 744e74c..5d27471 100644 --- a/db/migrate/20230421151548_remove_token_and_question_index_from_receipts.rb +++ b/db/migrate/20230421151548_remove_token_and_question_index_from_receipts.rb @@ -2,6 +2,6 @@ class RemoveTokenAndQuestionIndexFromReceipts < ActiveRecord::Migration[7.0] def change - remove_index :receipts, name: 'index_receipts_on_token_id_and_question_id' if index_exists?(:receipts, name: 'index_receipts_on_token_id_and_question_id') + remove_index :receipts, name: 'index_receipts_on_token_id_and_question_id' if index_exists?(:receipts, %i[token_id question_id], name: 'index_receipts_on_token_id_and_question_id') end end