diff --git a/app/controllers/admin/legislation/processes_controller.rb b/app/controllers/admin/legislation/processes_controller.rb index 06adf6370..8d349633b 100644 --- a/app/controllers/admin/legislation/processes_controller.rb +++ b/app/controllers/admin/legislation/processes_controller.rb @@ -37,7 +37,6 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll :title, :summary, :description, - :target, :additional_info, :start_date, :end_date, diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb index ff0132e53..ac49f8a7d 100644 --- a/app/views/admin/legislation/processes/_form.html.erb +++ b/app/views/admin/legislation/processes/_form.html.erb @@ -190,19 +190,6 @@ -
-
- <%= f.label :target %> - <%= t('admin.legislation.processes.form.use_markdown') %> -
-
- <%= f.text_area :target, - label: false, - rows: 5, - placeholder: t('admin.legislation.processes.form.target_placeholder') %> -
-
-
<%= f.label :additional_info %> diff --git a/app/views/legislation/processes/_header.html.erb b/app/views/legislation/processes/_header.html.erb index 18dd34d88..e958e48cb 100644 --- a/app/views/legislation/processes/_header.html.erb +++ b/app/views/legislation/processes/_header.html.erb @@ -13,12 +13,6 @@ <%= markdown process.description %> <% end %>
-
- <% if process.target.present? %> -

<%= t('legislation.processes.header_full.target') %>

- <%= markdown process.target %> - <% end %> -
<% if process.additional_info.present? %>
@@ -28,7 +22,7 @@ <% end %>
- <% if process.description.present? || process.target.present? || process.additional_info.present? %> + <% if process.description.present? || process.additional_info.present? %>
diff --git a/app/views/legislation/processes/_header_full.html.erb b/app/views/legislation/processes/_header_full.html.erb index d146aa7a3..5b04c2cdd 100644 --- a/app/views/legislation/processes/_header_full.html.erb +++ b/app/views/legislation/processes/_header_full.html.erb @@ -15,12 +15,6 @@ <%= markdown process.description %> <% end %>
-
- <% if process.target.present? %> -

<%= t('.target') %>

- <%= markdown process.target %> - <% end %> -
<% if process.additional_info.present? %>
diff --git a/app/views/sandbox/admin_legislation_info.html.erb b/app/views/sandbox/admin_legislation_info.html.erb index 82db31ed8..fe53bc724 100644 --- a/app/views/sandbox/admin_legislation_info.html.erb +++ b/app/views/sandbox/admin_legislation_info.html.erb @@ -97,18 +97,6 @@
-
-
- -
-
- -
-
-
diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml index f764e053d..c9fd00aab 100644 --- a/config/locales/activerecord.en.yml +++ b/config/locales/activerecord.en.yml @@ -167,7 +167,6 @@ en: legislation/process: title: Process Title description: Description - target: Target additional_info: Additional info start_date: Start date end_date: End date diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml index fe310b973..7b4fbebeb 100644 --- a/config/locales/activerecord.es.yml +++ b/config/locales/activerecord.es.yml @@ -162,7 +162,6 @@ es: legislation/process: title: Título del proceso description: En qué consiste - target: A quién afecta additional_info: Información adicional start_date: Fecha de inicio del proceso end_date: Fecha de fin del proceso diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 9e3a23118..15e0d2ed7 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -221,7 +221,6 @@ en: title_placeholder: The title of the process summary_placeholder: Short summary of the description description_placeholder: Add a description of the process - target_placeholder: Describe who is the target of the process additional_info_placeholder: Add an additional information you consider useful index: create: New process diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index ad48015a4..bee867531 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -221,7 +221,6 @@ es: title_placeholder: Escribe el título del proceso summary_placeholder: Resumen corto de la descripción description_placeholder: Añade una descripción del proceso - target_placeholder: Describe a quién va dirigido additional_info_placeholder: Añade cualquier información adicional que pueda ser de interés index: create: Nuevo proceso diff --git a/config/locales/legislation.en.yml b/config/locales/legislation.en.yml index 10146d80c..7faa3b44c 100644 --- a/config/locales/legislation.en.yml +++ b/config/locales/legislation.en.yml @@ -55,7 +55,6 @@ en: header_full: title: Participate description: Description - target: Target more_info: More information and context index: filters: diff --git a/config/locales/legislation.es.yml b/config/locales/legislation.es.yml index 063dd5169..acb6583ee 100644 --- a/config/locales/legislation.es.yml +++ b/config/locales/legislation.es.yml @@ -55,7 +55,6 @@ es: header_full: title: Colabora en la elaboración de la normativa sobre description: En qué consiste - target: A quién va dirigido more_info: Más información y contexto index: filters: diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index ccae0b74b..5dd5bc0c7 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -635,7 +635,6 @@ print "Creating legislation processes" process = ::Legislation::Process.create!(title: Faker::Lorem.sentence(3).truncate(60), description: Faker::Lorem.paragraphs.join("\n\n"), summary: Faker::Lorem.paragraph, - target: Faker::Lorem.paragraphs.join("\n\n"), additional_info: Faker::Lorem.paragraphs.join("\n\n"), start_date: Date.current - 3.days, end_date: Date.current + 3.days, diff --git a/spec/factories.rb b/spec/factories.rb index 26e3a1abf..91a511420 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -604,7 +604,6 @@ FactoryGirl.define do title "A collaborative legislation process" description "Description of the process" summary "Summary of the process" - target "Who will affected by this law?" start_date Date.current - 5.days end_date Date.current + 5.days debate_start_date Date.current - 5.days diff --git a/spec/features/admin/legislation/processes_spec.rb b/spec/features/admin/legislation/processes_spec.rb index 9973ba357..9956c5cc7 100644 --- a/spec/features/admin/legislation/processes_spec.rb +++ b/spec/features/admin/legislation/processes_spec.rb @@ -41,7 +41,6 @@ feature 'Admin legislation processes' do fill_in 'legislation_process_title', with: 'An example legislation process' fill_in 'legislation_process_summary', with: 'Summary of the process' fill_in 'legislation_process_description', with: 'Describing the process' - fill_in 'legislation_process_target', with: 'This thing affects people' base_date = Date.current fill_in 'legislation_process[start_date]', with: base_date.strftime("%d/%m/%Y")