From 616efbffeddcacd94b96a4ec9ca5b55ecb4b99c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Fri, 23 Jun 2017 13:12:46 +0200 Subject: [PATCH] uses path instead of url for proposal improvement link --- app/controllers/proposals_controller.rb | 2 +- app/views/proposals/share.html.erb | 4 ++-- db/seeds.rb | 2 +- spec/features/proposals_spec.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 17b1ff375..0dab0fa9e 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -57,7 +57,7 @@ class ProposalsController < ApplicationController def share if Setting['proposal_improvement_path'].present? - @proposal_improvement_url = root_url + Setting['proposal_improvement_path'] + @proposal_improvement_path = Setting['proposal_improvement_path'] end end diff --git a/app/views/proposals/share.html.erb b/app/views/proposals/share.html.erb index d1538e524..5755e6225 100644 --- a/app/views/proposals/share.html.erb +++ b/app/views/proposals/share.html.erb @@ -31,8 +31,8 @@
- <% if @proposal_improvement_url.present? %> -

<%= t('proposals.proposal.improve_info', improve_info_link: link_to(t('proposals.proposal.improve_info_link'), @proposal_improvement_url)).html_safe %>

+ <% if @proposal_improvement_path.present? %> +

<%= t('proposals.proposal.improve_info', improve_info_link: link_to(t('proposals.proposal.improve_info_link'), @proposal_improvement_path)).html_safe %>

<% end %>

diff --git a/db/seeds.rb b/db/seeds.rb index 3aa795561..eebea2461 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -105,5 +105,5 @@ Setting['mailer_from_address'] = 'noreply@consul.dev' Setting['verification_offices_url'] = 'http://oficinas-atencion-ciudadano.url/' Setting['min_age_to_participate'] = 16 -# Proposal improvement url path ('more-information/proposal-improvement') +# Proposal improvement url path ('/more-information/proposal-improvement') Setting['proposal_improvement_path'] = nil diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 1bef9dc61..bd7cafee1 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -157,7 +157,7 @@ feature 'Proposals' do end scenario 'Create with proposal improvement info link' do - Setting['proposal_improvement_path'] = 'more-information/proposal-improvement' + Setting['proposal_improvement_path'] = '/more-information/proposal-improvement' author = create(:user) login_as(author)