From 51619888449adb92e875f3797c4d61cc31541f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 8 Jan 2018 17:09:30 +0100 Subject: [PATCH] Removed external_url input --- app/controllers/budgets/investments_controller.rb | 2 +- app/views/budgets/investments/_form.html.erb | 4 ---- app/views/valuation/budget_investments/edit.html.erb | 6 +----- spec/features/emails_spec.rb | 1 - 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/controllers/budgets/investments_controller.rb b/app/controllers/budgets/investments_controller.rb index f6125c214..8522352e3 100644 --- a/app/controllers/budgets/investments_controller.rb +++ b/app/controllers/budgets/investments_controller.rb @@ -103,7 +103,7 @@ module Budgets def investment_params params.require(:budget_investment) - .permit(:title, :description, :external_url, :heading_id, :tag_list, + .permit(:title, :description, :heading_id, :tag_list, :organization_name, :location, :terms_of_service, :skip_map, image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb index fffafcb0d..9c419dc0f 100644 --- a/app/views/budgets/investments/_form.html.erb +++ b/app/views/budgets/investments/_form.html.erb @@ -17,10 +17,6 @@ <%= f.cktext_area :description, maxlength: SpendingProposal.description_max_length, ckeditor: { language: I18n.locale } %> -
- <%= f.text_field :external_url %> -
- <% if feature?(:allow_images) %>
<%= render 'images/nested_image', imageable: @investment, f: f %> diff --git a/app/views/valuation/budget_investments/edit.html.erb b/app/views/valuation/budget_investments/edit.html.erb index fa748b098..4ecd8748e 100644 --- a/app/views/valuation/budget_investments/edit.html.erb +++ b/app/views/valuation/budget_investments/edit.html.erb @@ -103,10 +103,6 @@ <%= safe_html_with_links @investment.description %> -<% if @investment.external_url.present? %> -

<%= text_with_links @investment.external_url %>

-<% end %> -

<%= t("valuation.budget_investments.show.info") %>

<%= t("valuation.budget_investments.show.by") %>: @@ -142,4 +138,4 @@

  • <%= t("valuation.budget_investments.show.undefined") %>
  • <% end %> -
    \ No newline at end of file + diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index ca418de10..f4bd7e08e 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -369,7 +369,6 @@ feature 'Emails' do select "#{group.name}: #{heading.name}", from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'Build a hospital' fill_in 'budget_investment_description', with: 'We have lots of people that require medical attention' - fill_in 'budget_investment_external_url', with: 'http://http://hospitalsforallthepeople.com/' check 'budget_investment_terms_of_service' click_button 'Create Investment'