Merge pull request #2280 from consul/2277-budgets_new_form

Budgets new form

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],

app/views/budgets/investments/_form.html.erb

@@ -17,10 +17,6 @@
       <%= f.cktext_area :description, maxlength: SpendingProposal.description_max_length, ckeditor: { language: I18n.locale } %>
     </div>
 
-    <div class="small-12 column">
-      <%= f.text_field :external_url %>
-    </div>
-
     <% if feature?(:allow_images) %>
       <div class="images small-12 column">
         <%= render 'images/nested_image', imageable: @investment, f: f %>
@@ -46,7 +42,8 @@
     <% end %>
 
     <div class="small-12 column">
-      <%= f.text_field :location %>
+      <%= f.label :location, t("budgets.investments.form.location") %>
+      <%= f.text_field :location, label: false %>
     </div>
 
     <div class="small-12 column">

app/views/valuation/budget_investments/edit.html.erb

@@ -103,10 +103,6 @@
 
 <%= safe_html_with_links @investment.description %>
 
-<% if @investment.external_url.present? %>
-  <p><%= text_with_links @investment.external_url %></p>
-<% end %>
-
 <h2><%= t("valuation.budget_investments.show.info") %></h2>
 
 <p><strong><%= t("valuation.budget_investments.show.by") %>:</strong>
@@ -142,4 +138,4 @@
       <li><%= t("valuation.budget_investments.show.undefined") %></li>
     <% end %>
   </ul>
-</div>
+</div>

config/locales/en/budgets.yml

@@ -59,6 +59,7 @@ en:
         map_location: "Map location"
         map_location_instructions: "Navigate the map to the location and place the marker."
         map_remove_marker: "Remove map marker"
+        location: "Location additional info"
       index:
         title: Participatory budgeting
         unfeasible: Unfeasible investment projects

config/locales/es/budgets.yml

@@ -59,6 +59,7 @@ es:
         map_location: "Ubicación en el mapa"
         map_location_instructions: "Navega por el mapa hasta la ubicación y coloca el marcador."
         map_remove_marker: "Eliminar el marcador"
+        location: "Información adicional de la ubicación"
       index:
         title: Presupuestos participativos
         unfeasible: Propuestas de inversión no viables

db/dev_seeds.rb

@@ -438,7 +438,6 @@ section "Creating Investments" do
       group: heading.group,
       budget: heading.group.budget,
       title: Faker::Lorem.sentence(3).truncate(60),
-      external_url: Faker::Internet.url,
       description: "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>",
       created_at: rand((Time.current - 1.week)..Time.current),
       feasibility: %w{undecided unfeasible feasible feasible feasible feasible}.sample,
@@ -468,7 +467,6 @@ section "Winner Investments" do
       group: heading.group,
       budget: heading.group.budget,
       title: Faker::Lorem.sentence(3).truncate(60),
-      external_url: Faker::Internet.url,
       description: "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>",
       created_at: rand((Time.current - 1.week)..Time.current),
       feasibility: "feasible",

spec/factories.rb

@@ -284,7 +284,6 @@ FactoryBot.define do
     description          'Spend money on this'
     price                10
     unfeasibility_explanation ''
-    external_url         'http://external_documention.org'
     skip_map             '1'
     terms_of_service     '1'
     incompatible          false

spec/features/budgets/investments_spec.rb

@@ -311,7 +311,6 @@ feature 'Budget Investments' do
       select  'Health: More hospitals', from: 'budget_investment_heading_id'
       fill_in 'budget_investment_title', with: 'Build a skyscraper'
       fill_in 'budget_investment_description', with: 'I want to live in a high tower over the clouds'
-      fill_in 'budget_investment_external_url', with: 'http://http://skyscraperpage.com/'
       fill_in 'budget_investment_location', with: 'City center'
       fill_in 'budget_investment_organization_name', with: 'T.I.A.'
       fill_in 'budget_investment_tag_list', with: 'Towers'
@@ -322,7 +321,6 @@ feature 'Budget Investments' do
       expect(page).to have_content 'Investment created successfully'
       expect(page).to have_content 'Build a skyscraper'
       expect(page).to have_content 'I want to live in a high tower over the clouds'
-      expect(page).to have_content 'http://http://skyscraperpage.com/'
       expect(page).to have_content 'City center'
       expect(page).to have_content 'T.I.A.'
       expect(page).to have_content 'Towers'

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'

spec/features/management/budget_investments_spec.rb

@@ -32,7 +32,6 @@ feature 'Budget Investments' do
       select "Whole city: Health", from: 'budget_investment_heading_id'
       fill_in 'budget_investment_title', with: 'Build a park in my neighborhood'
       fill_in 'budget_investment_description', with: 'There is no parks here...'
-      fill_in 'budget_investment_external_url', with: 'http://moarparks.com'
       fill_in 'budget_investment_location', with: 'City center'
       fill_in 'budget_investment_organization_name', with: 'T.I.A.'
       fill_in 'budget_investment_tag_list', with: 'green'
@@ -44,7 +43,6 @@ feature 'Budget Investments' do
       expect(page).to have_content 'Health'
       expect(page).to have_content 'Build a park in my neighborhood'
       expect(page).to have_content 'There is no parks here...'
-      expect(page).to have_content 'http://moarparks.com'
       expect(page).to have_content 'City center'
       expect(page).to have_content 'T.I.A.'
       expect(page).to have_content 'green'