diff --git a/app/controllers/admin/signature_sheets_controller.rb b/app/controllers/admin/signature_sheets_controller.rb index a4e01b97e..11dbce3ed 100644 --- a/app/controllers/admin/signature_sheets_controller.rb +++ b/app/controllers/admin/signature_sheets_controller.rb @@ -26,6 +26,11 @@ class Admin::SignatureSheetsController < Admin::BaseController private def signature_sheet_params - params.require(:signature_sheet).permit(:signable_type, :signable_id, :document_numbers, :title, :required_fields_to_verify) + params.require(:signature_sheet).permit( + :signable_type, + :signable_id, + :title, + :required_fields_to_verify + ) end end diff --git a/app/models/signature_sheet.rb b/app/models/signature_sheet.rb index 538f27a65..c767c0bf1 100644 --- a/app/models/signature_sheet.rb +++ b/app/models/signature_sheet.rb @@ -13,7 +13,11 @@ class SignatureSheet < ApplicationRecord validate :signable_found def name - title ? "#{signable_name} #{signable_id}: #{title}" : "#{signable_name} #{signable_id}" + if title.present? + "#{signable_name} #{signable_id}: #{title}" + else + "#{signable_name} #{signable_id}" + end end def signable_name diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index d30a8785b..cd9b4c6f7 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -300,6 +300,7 @@ en: body: "Message" title: "Title" signature_sheet: + title: "Title" signable_type: "Signable type" signable_id: "Signable ID" document_numbers: "Documents numbers" diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index ceef5bb12..0e1f39c92 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -302,6 +302,7 @@ es: body: "Mensaje" title: "Título" signature_sheet: + title: "Título" signable_type: "Tipo de hoja de firmas" signable_id: "ID Propuesta ciudadana/Proyecto de gasto" document_numbers: "Números de documentos" diff --git a/spec/factories/proposals.rb b/spec/factories/proposals.rb index a36891e54..e4e31278f 100644 --- a/spec/factories/proposals.rb +++ b/spec/factories/proposals.rb @@ -118,12 +118,10 @@ FactoryBot.define do association :signable, factory: :proposal association :author, factory: :user required_fields_to_verify { "123A, 456B, 789C" } - document_numbers "123A, 456B, 789C" trait :with_title do title { Faker::Lorem.sentence } end - end factory :signature do diff --git a/spec/features/admin/signature_sheets_spec.rb b/spec/features/admin/signature_sheets_spec.rb index 65b30463f..57d57d350 100644 --- a/spec/features/admin/signature_sheets_spec.rb +++ b/spec/features/admin/signature_sheets_spec.rb @@ -145,7 +145,7 @@ describe "Signature sheets" do visit admin_signature_sheet_path(signature_sheet) expect(page).to have_content "Citizen proposal #{proposal.id}: #{signature_sheet.title}" - expect(page).to have_content "12345678Z, 123A, 123B" + expect(page).to have_content "12345678Z; 123A; 123B" expect(page).to have_content signature_sheet.created_at.strftime("%B %d, %Y %H:%M") expect(page).to have_content user.name diff --git a/spec/models/signature_sheet_spec.rb b/spec/models/signature_sheet_spec.rb index cc2bf9b19..8eb16b6d3 100644 --- a/spec/models/signature_sheet_spec.rb +++ b/spec/models/signature_sheet_spec.rb @@ -38,7 +38,7 @@ describe SignatureSheet do end describe "#name" do - context "when name is nil" do + context "when title is nil" do it "returns name for proposal signature sheets" do proposal = create(:proposal) signature_sheet.signable = proposal @@ -54,7 +54,7 @@ describe SignatureSheet do end end - context "when name is not nil" do + context "when title is not nil" do let(:signature_sheet) { build(:signature_sheet, :with_title) } it "returns name for proposal signature sheets" do @@ -71,6 +71,24 @@ describe SignatureSheet do expect(signature_sheet.name).to eq("Investment #{budget_investment.id}: #{signature_sheet.title}") end end + + context "when title is an empty string" do + let(:signature_sheet) { build(:signature_sheet, title: "") } + + it "returns name for proposal signature sheets" do + proposal = create(:proposal) + signature_sheet.signable = proposal + + expect(signature_sheet.name).to eq("Citizen proposal #{proposal.id}") + end + + it "returns name for budget investment signature sheets" do + budget_investment = create(:budget_investment) + signature_sheet.signable = budget_investment + + expect(signature_sheet.name).to eq("Investment #{budget_investment.id}") + end + end end describe "#verify_signatures" do