From 5bdac5c4f56d253ab8a1f92942e0f51874345311 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 14 Mar 2019 14:06:58 +0100
Subject: [PATCH] Remove question and external_url fields from legislation
 proposals

---
 app/controllers/legislation/proposals_controller.rb  |  2 +-
 app/models/legislation/proposal.rb                   |  1 -
 app/views/legislation/proposals/show.html.erb        | 12 ------------
 db/dev_seeds/legislation_proposals.rb                |  1 -
 ...on_and_external_url_from_legislation_proposals.rb |  6 ++++++
 db/schema.rb                                         |  1 -
 6 files changed, 7 insertions(+), 16 deletions(-)
 create mode 100644 db/migrate/20190307165337_remove_question_and_external_url_from_legislation_proposals.rb

diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb
index 4da2cb621..944a4f6aa 100644
--- a/app/controllers/legislation/proposals_controller.rb
+++ b/app/controllers/legislation/proposals_controller.rb
@@ -53,7 +53,7 @@ class Legislation::ProposalsController < Legislation::BaseController
 
     def proposal_params
       params.require(:legislation_proposal).permit(:legislation_process_id, :title,
-                    :question, :summary, :description, :video_url, :tag_list,
+                    :summary, :description, :video_url, :tag_list,
                     :terms_of_service, :geozone_id,
                     image_attributes: image_attributes,
                     documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id])
diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb
index 16ab2d7dd..d6fdf5eb3 100644
--- a/app/models/legislation/proposal.rb
+++ b/app/models/legislation/proposal.rb
@@ -60,7 +60,6 @@ class Legislation::Proposal < ApplicationRecord
 
   def searchable_values
     { title              => "A",
-      question           => "B",
       author.username    => "B",
       tag_list.join(" ") => "B",
       geozone.try(:name) => "B",
diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb
index 7d8d18687..e8e213b06 100644
--- a/app/views/legislation/proposals/show.html.erb
+++ b/app/views/legislation/proposals/show.html.erb
@@ -59,16 +59,6 @@
 
         <%= safe_html_with_links @proposal.description %>
 
-        <% if @proposal.external_url.present? %>
-          <div class="document-link">
-            <p>
-              <span class="icon-document"></span>&nbsp;
-              <strong><%= t("proposals.show.title_external_url") %></strong>
-            </p>
-              <%= text_with_links @proposal.external_url %>
-          </div>
-        <% end %>
-
         <% if @proposal.video_url.present? %>
           <div class="video-link">
             <p>
@@ -80,8 +70,6 @@
 
         <% end %>
 
-        <h4><%= @proposal.question %></h4>
-
         <% if feature?(:allow_attached_documents) %>
           <%= render "documents/documents",
                       documents: @proposal.documents,
diff --git a/db/dev_seeds/legislation_proposals.rb b/db/dev_seeds/legislation_proposals.rb
index def1b6535..3f6a19955 100644
--- a/db/dev_seeds/legislation_proposals.rb
+++ b/db/dev_seeds/legislation_proposals.rb
@@ -2,7 +2,6 @@ section "Creating legislation proposals" do
   10.times do
     Legislation::Proposal.create!(title: Faker::Lorem.sentence(3).truncate(60),
                                   description: Faker::Lorem.paragraphs.join("\n\n"),
-                                  question: Faker::Lorem.sentence(3),
                                   summary: Faker::Lorem.paragraph,
                                   author: User.all.sample,
                                   process: Legislation::Process.all.sample,
diff --git a/db/migrate/20190307165337_remove_question_and_external_url_from_legislation_proposals.rb b/db/migrate/20190307165337_remove_question_and_external_url_from_legislation_proposals.rb
new file mode 100644
index 000000000..f44f47a65
--- /dev/null
+++ b/db/migrate/20190307165337_remove_question_and_external_url_from_legislation_proposals.rb
@@ -0,0 +1,6 @@
+class RemoveQuestionAndExternalUrlFromLegislationProposals < ActiveRecord::Migration
+  def change
+    remove_column :legislation_proposals, :question, :string
+    remove_column :legislation_proposals, :external_url, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a49ab75a7..d8a3d9e69 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -727,7 +727,6 @@ ActiveRecord::Schema.define(version: 20190411090023) do
     t.integer  "legislation_process_id"
     t.string   "title",                  limit: 80
     t.text     "description"
-    t.string   "question"
     t.integer  "author_id"
     t.datetime "hidden_at"
     t.integer  "flags_count",                       default: 0