Remove proposal improvement path setting
This commit is contained in:
@@ -64,12 +64,6 @@ class ProposalsController < ApplicationController
|
|||||||
def retire_form
|
def retire_form
|
||||||
end
|
end
|
||||||
|
|
||||||
def share
|
|
||||||
if Setting['proposal_improvement_path'].present?
|
|
||||||
@proposal_improvement_path = Setting['proposal_improvement_path']
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def vote_featured
|
def vote_featured
|
||||||
@proposal.register_vote(current_user, 'yes')
|
@proposal.register_vote(current_user, 'yes')
|
||||||
set_featured_proposal_votes(@proposal)
|
set_featured_proposal_votes(@proposal)
|
||||||
|
|||||||
@@ -27,13 +27,6 @@
|
|||||||
description: @proposal.summary
|
description: @proposal.summary
|
||||||
} %>
|
} %>
|
||||||
|
|
||||||
<% if @proposal_improvement_path.present? %>
|
|
||||||
<div class="callout highlight margin-top text-center">
|
|
||||||
<p class="lead"><strong><%= t("proposals.proposal.improve_info") %></strong></p>
|
|
||||||
<%= link_to t("proposals.proposal.improve_info_link"), @proposal_improvement_path, class: "button" %>
|
|
||||||
</div>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<div class="small margin-bottom">
|
<div class="small margin-bottom">
|
||||||
<%= link_to t("proposals.proposal.share.view_proposal"), proposal_path(@proposal) %>
|
<%= link_to t("proposals.proposal.share.view_proposal"), proposal_path(@proposal) %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -397,8 +397,6 @@ en:
|
|||||||
guide: "Now you can share it so people can start supporting."
|
guide: "Now you can share it so people can start supporting."
|
||||||
edit: "Before it gets shared you'll be able to change the text as you like."
|
edit: "Before it gets shared you'll be able to change the text as you like."
|
||||||
view_proposal: Not now, go to my proposal
|
view_proposal: Not now, go to my proposal
|
||||||
improve_info: "Improve your campaign and get more supports"
|
|
||||||
improve_info_link: "See more information"
|
|
||||||
already_supported: You have already supported this proposal. Share it!
|
already_supported: You have already supported this proposal. Share it!
|
||||||
comments:
|
comments:
|
||||||
one: 1 comment
|
one: 1 comment
|
||||||
|
|||||||
@@ -74,7 +74,6 @@ en:
|
|||||||
min_age_to_participate_description: "Users over this age can participate in all processes"
|
min_age_to_participate_description: "Users over this age can participate in all processes"
|
||||||
analytics_url: "Analytics URL"
|
analytics_url: "Analytics URL"
|
||||||
verification_offices_url: Verification offices URL
|
verification_offices_url: Verification offices URL
|
||||||
proposal_improvement_path: Proposal improvement info internal link
|
|
||||||
feature:
|
feature:
|
||||||
budgets: "Participatory budgeting"
|
budgets: "Participatory budgeting"
|
||||||
budgets_description: "With participatory budgets, citizens decide which projects presented by their neighbours will receive a part of the municipal budget"
|
budgets_description: "With participatory budgets, citizens decide which projects presented by their neighbours will receive a part of the municipal budget"
|
||||||
|
|||||||
@@ -397,8 +397,6 @@ es:
|
|||||||
guide: "Compártela para que la gente empiece a apoyarla."
|
guide: "Compártela para que la gente empiece a apoyarla."
|
||||||
edit: "Antes de que se publique podrás modificar el texto a tu gusto."
|
edit: "Antes de que se publique podrás modificar el texto a tu gusto."
|
||||||
view_proposal: Ahora no, ir a mi propuesta
|
view_proposal: Ahora no, ir a mi propuesta
|
||||||
improve_info: "Mejora tu campaña y consigue más apoyos"
|
|
||||||
improve_info_link: "Ver más información"
|
|
||||||
already_supported: '¡Ya has apoyado esta propuesta, compártela!'
|
already_supported: '¡Ya has apoyado esta propuesta, compártela!'
|
||||||
comments:
|
comments:
|
||||||
zero: Sin comentarios
|
zero: Sin comentarios
|
||||||
|
|||||||
@@ -74,7 +74,6 @@ es:
|
|||||||
min_age_to_participate_description: "Los usuarios mayores de esta edad podrán participar en todos los procesos"
|
min_age_to_participate_description: "Los usuarios mayores de esta edad podrán participar en todos los procesos"
|
||||||
analytics_url: "URL de estadísticas externas"
|
analytics_url: "URL de estadísticas externas"
|
||||||
verification_offices_url: URL oficinas verificación
|
verification_offices_url: URL oficinas verificación
|
||||||
proposal_improvement_path: Link a información para mejorar propuestas
|
|
||||||
feature:
|
feature:
|
||||||
budgets: "Presupuestos participativos"
|
budgets: "Presupuestos participativos"
|
||||||
budgets_description: "Con los presupuestos participativos la ciudadanía decide a qué proyectos presentados por los vecinos y vecinas va destinada una parte del presupuesto municipal"
|
budgets_description: "Con los presupuestos participativos la ciudadanía decide a qué proyectos presentados por los vecinos y vecinas va destinada una parte del presupuesto municipal"
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ section "Creating Settings" do
|
|||||||
Setting.create(key: 'meta_keywords', value: 'citizen participation, open government')
|
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: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/')
|
||||||
Setting.create(key: 'min_age_to_participate', value: '16')
|
Setting.create(key: 'min_age_to_participate', value: '16')
|
||||||
Setting.create(key: 'proposal_improvement_path', value: nil)
|
|
||||||
Setting.create(key: 'map_latitude', value: 40.41)
|
Setting.create(key: 'map_latitude', value: 40.41)
|
||||||
Setting.create(key: 'map_longitude', value: -3.7)
|
Setting.create(key: 'map_longitude', value: -3.7)
|
||||||
Setting.create(key: 'map_zoom', value: 10)
|
Setting.create(key: 'map_zoom', value: 10)
|
||||||
|
|||||||
@@ -116,9 +116,6 @@ Setting['min_age_to_participate'] = 16
|
|||||||
# Featured proposals
|
# Featured proposals
|
||||||
Setting['featured_proposals_number'] = 3
|
Setting['featured_proposals_number'] = 3
|
||||||
|
|
||||||
# Proposal improvement url path ('/help/proposal-improvement')
|
|
||||||
Setting['proposal_improvement_path'] = nil
|
|
||||||
|
|
||||||
# City map feature default configuration (Greenwich)
|
# City map feature default configuration (Greenwich)
|
||||||
Setting['map_latitude'] = 51.48
|
Setting['map_latitude'] = 51.48
|
||||||
Setting['map_longitude'] = 0.0
|
Setting['map_longitude'] = 0.0
|
||||||
|
|||||||
@@ -248,34 +248,6 @@ feature "Proposals" do
|
|||||||
expect(page).to have_content I18n.l(Proposal.last.created_at.to_date)
|
expect(page).to have_content I18n.l(Proposal.last.created_at.to_date)
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario "Create with proposal improvement info link" do
|
|
||||||
Setting["proposal_improvement_path"] = "/more-information/proposal-improvement"
|
|
||||||
author = create(:user)
|
|
||||||
login_as(author)
|
|
||||||
|
|
||||||
visit new_proposal_path
|
|
||||||
fill_in "proposal_title", with: "Help refugees"
|
|
||||||
fill_in "proposal_question", with: "¿Would you like to give assistance to war refugees?"
|
|
||||||
fill_in "proposal_summary", with: "In summary, what we want is..."
|
|
||||||
fill_in "proposal_description", with: "This is very important because..."
|
|
||||||
fill_in "proposal_external_url", with: "http://rescue.org/refugees"
|
|
||||||
fill_in "proposal_video_url", with: "https://www.youtube.com/watch?v=yPQfcG-eimk"
|
|
||||||
fill_in "proposal_responsible_name", with: "Isabel Garcia"
|
|
||||||
fill_in "proposal_tag_list", with: "Refugees, Solidarity"
|
|
||||||
check "proposal_terms_of_service"
|
|
||||||
|
|
||||||
click_button "Create proposal"
|
|
||||||
|
|
||||||
expect(page).to have_content "Proposal created successfully."
|
|
||||||
expect(page).to have_content "Improve your campaign and get more supports"
|
|
||||||
|
|
||||||
click_link "Not now, go to my proposal"
|
|
||||||
|
|
||||||
expect(page).to have_content "Help refugees"
|
|
||||||
|
|
||||||
Setting["proposal_improvement_path"] = nil
|
|
||||||
end
|
|
||||||
|
|
||||||
scenario "Create with invisible_captcha honeypot field" do
|
scenario "Create with invisible_captcha honeypot field" do
|
||||||
author = create(:user)
|
author = create(:user)
|
||||||
login_as(author)
|
login_as(author)
|
||||||
|
|||||||
Reference in New Issue
Block a user