From f15ef5b66b686fd2493d33467225b50c92000564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 26 Oct 2017 16:56:30 +0200 Subject: [PATCH 1/2] Removed Legislation Proposals suggestions in form --- app/views/legislation/proposals/_form.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/legislation/proposals/_form.html.erb b/app/views/legislation/proposals/_form.html.erb index 4efbeb4e2..2cf43c3b9 100644 --- a/app/views/legislation/proposals/_form.html.erb +++ b/app/views/legislation/proposals/_form.html.erb @@ -6,9 +6,8 @@
<%= f.label :title, t("proposals.form.proposal_title") %> - <%= f.text_field :title, maxlength: Legislation::Proposal.title_max_length, placeholder: t("proposals.form.proposal_title"), label: false, data: {js_suggest_result: "js_suggest_result", js_suggest: "#js-suggest", js_url: suggest_proposals_path}%> + <%= f.text_field :title, maxlength: Legislation::Proposal.title_max_length, placeholder: t("proposals.form.proposal_title"), label: false %>
-
<%= f.invisible_captcha :subtitle %> From 658d115c91e592537bf5e7746e3cca04e0677cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 26 Oct 2017 17:13:04 +0200 Subject: [PATCH 2/2] Removed share view for Legislation Proposals --- .../legislation/proposals_controller.rb | 8 +-- .../legislation/proposals/share.html.erb | 51 ------------------- config/routes.rb | 1 - 3 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 app/views/legislation/proposals/share.html.erb diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb index fa35ea171..ee4d10c06 100644 --- a/app/controllers/legislation/proposals_controller.rb +++ b/app/controllers/legislation/proposals_controller.rb @@ -30,7 +30,7 @@ class Legislation::ProposalsController < Legislation::BaseController @proposal = Legislation::Proposal.new(proposal_params.merge(author: current_user)) if @proposal.save - redirect_to share_legislation_process_proposal_path(params[:process_id], @proposal), notice: I18n.t('flash.actions.create.proposal') + redirect_to legislation_process_proposal_path(params[:process_id], @proposal), notice: I18n.t('flash.actions.create.proposal') else render :new end @@ -46,12 +46,6 @@ class Legislation::ProposalsController < Legislation::BaseController set_legislation_proposal_votes(@proposal) end - def share - if Setting['proposal_improvement_path'].present? - @proposal_improvement_path = Setting['proposal_improvement_path'] - end - end - private def proposal_params diff --git a/app/views/legislation/proposals/share.html.erb b/app/views/legislation/proposals/share.html.erb deleted file mode 100644 index 8ea0f7e98..000000000 --- a/app/views/legislation/proposals/share.html.erb +++ /dev/null @@ -1,51 +0,0 @@ -<% provide :title do %><%= @proposal.title %><% end %> -<% provide :social_media_meta_tags do %> -<%= render "shared/social_media_meta_tags", - social_url: proposal_url(@proposal), - social_title: @proposal.title, - social_description: @proposal.summary %> -<% end %> -<% content_for :canonical do %> - <%= render "shared/canonical", href: proposal_url(@proposal) %> -<% end %> - -<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @legislation_proposal_votes] do %> -
-
-
- -

<%= t("proposals.proposal.created") %>

- -

- <%= t("proposals.proposal.share.guide") %>
- <%= t("proposals.proposal.share.edit") %> -

- - <%= render partial: 'shared/social_share', locals: { - title: @proposal.title, - url: proposal_url(@proposal) - } %> - - <% if @proposal_improvement_path.present? %> -
-

<%= t("proposals.proposal.improve_info") %>

- <%= link_to t("proposals.proposal.improve_info_link"), @proposal_improvement_path, class: "button" %> -
- <% end %> - -
- <%= link_to t("proposals.proposal.share.view_proposal"), legislation_process_proposal_path(@proposal.legislation_process_id, @proposal) %> -
-
- -
-
-

- <%= @proposal.title %>
- <%= t("proposals.show.code") %> <%= @proposal.code %> -

-
-
-
-
-<% end %> diff --git a/config/routes.rb b/config/routes.rb index d98ca98e2..491127439 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -139,7 +139,6 @@ Rails.application.routes.draw do post :vote put :flag put :unflag - get :share end collection do get :map