consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uses path instead of url for proposal improvement link

Browse Source
This commit is contained in:
Juanjo Bazán
2017-06-23 13:12:46 +02:00
parent 84c5b67644
commit 616efbffed
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/proposals_controller.rb
View File

@@ -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

4
app/views/proposals/share.html.erb
View File

@@ -31,8 +31,8 @@
<br/>
<% if @proposal_improvement_url.present? %>
<p><%= t('proposals.proposal.improve_info', improve_info_link: link_to(t('proposals.proposal.improve_info_link'), @proposal_improvement_url)).html_safe %></p>
<% if @proposal_improvement_path.present? %>
<p><%= t('proposals.proposal.improve_info', improve_info_link: link_to(t('proposals.proposal.improve_info_link'), @proposal_improvement_path)).html_safe %></p>
<% end %>
<p>

2
db/seeds.rb
View File

@@ -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

2
spec/features/proposals_spec.rb
View File

@@ -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)