Rename proposal_improvement_url to proposal_improvement_path to truly describe the value that the variable holds

This commit is contained in:
Bertocq
2017-05-31 12:51:01 +02:00
parent 469d4a02a9
commit cf8bc486e4
6 changed files with 8 additions and 8 deletions

View File

@@ -56,8 +56,8 @@ class ProposalsController < ApplicationController
end
def share
if Setting['proposal_improvement_url'].present?
@proposal_improvement_url = root_url + Setting['proposal_improvement_url']
if Setting['proposal_improvement_path'].present?
@proposal_improvement_url = root_url + Setting['proposal_improvement_path']
end
end

View File

@@ -44,4 +44,4 @@ en:
meta_keywords: "Keywords (SEO)"
verification_offices_url: Verification offices URL
min_age_to_participate: Minimum age needed to participate
proposal_improvement_url: Proposal improvement info internal link
proposal_improvement_path: Proposal improvement info internal link

View File

@@ -44,4 +44,4 @@ es:
meta_keywords: "Palabras clave (SEO)"
verification_offices_url: URL oficinas verificación
min_age_to_participate: Edad mínima para participar
proposal_improvement_url: Link a información para mejorar propuestas
proposal_improvement_path: Link a información para mejorar propuestas

View File

@@ -44,7 +44,7 @@ Setting.create(key: 'meta_description', value: 'Citizen Participation and Open G
Setting.create(key: 'meta_keywords', value: 'citizen participation, open government')
Setting.create(key: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/')
Setting.create(key: 'min_age_to_participate', value: '16')
Setting.create(key: 'proposal_improvement_url', value: nil)
Setting.create(key: 'proposal_improvement_path', value: nil)
puts ""
print "Creating Geozones"

View File

@@ -105,4 +105,4 @@ Setting['verification_offices_url'] = 'http://oficinas-atencion-ciudadano.url/'
Setting['min_age_to_participate'] = 16
# Proposal improvement url path ('more-information/proposal-improvement')
Setting['proposal_improvement_url'] = nil
Setting['proposal_improvement_path'] = nil

View File

@@ -157,7 +157,7 @@ feature 'Proposals' do
end
scenario 'Create with proposal improvement info link' do
Setting['proposal_improvement_url'] = 'more-information/proposal-improvement'
Setting['proposal_improvement_path'] = 'more-information/proposal-improvement'
author = create(:user)
login_as(author)
@@ -181,7 +181,7 @@ feature 'Proposals' do
expect(page).to have_content 'Help refugees'
Setting['proposal_improvement_url'] = nil
Setting['proposal_improvement_path'] = nil
end
scenario 'Create with invisible_captcha honeypot field' do