From 51dfe9d8d8456425c933f377f8865b2ddf2145f6 Mon Sep 17 00:00:00 2001
From: eskilmar <eskilmar@hotmail.com>
Date: Tue, 2 Feb 2021 10:39:37 +0200
Subject: [PATCH] Taking out edit_form_fields from overriding files

---
 .../proposals/_edit_form_fields.html.erb      | 78 -------------------
 .../proposals/proposals/complete.html.erb     |  2 +-
 .../proposals/proposals/edit_draft.html.erb   |  2 +-
 3 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 app/views/decidim/proposals/proposals/_edit_form_fields.html.erb

diff --git a/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb b/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb
deleted file mode 100644
index 4a6d86db..00000000
--- a/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb
+++ /dev/null
@@ -1,78 +0,0 @@
-<div class="field hashtags__container">
-  <%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: form_presenter.title %>
-</div>
-
-<div class="field hashtags__container">
-  <%= text_editor_for_proposal_body(form) %>
-</div>
-
-<% if @form.component_automatic_hashtags.any? %>
-  <div class="field">
-    <%= form.label :automatic_hashtags %>
-    <div class="checkboxes hashtags">
-      <% @form.component_automatic_hashtags.each do |hashtag| %>
-        <label>
-          <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
-        </label>
-      <% end %>
-    </div>
-  </div>
-<% end %>
-
-<% if @form.component_suggested_hashtags.any? %>
-  <div class="field">
-    <%= form.label :suggested_hashtags %>
-    <div class="checkboxes hashtags">
-      <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map {|hashtag| [hashtag.downcase, "##{hashtag}"]}, :first, :last do |option|
-        option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
-      end %>
-    </div>
-  </div>
-<% end %>
-
-<% if component_settings.geocoding_enabled? %>
-  <div class="field">
-    <%= form.check_box :has_address, checked: form_has_address? %>
-  </div>
-
-  <div class="field" id="address_input">
-    <%= form.text_field :address %>
-  </div>
-<% end %>
-
-<% if @form.categories&.any? %>
-  <div class="field">
-    <%= form.categories_select :category_id, @form.categories, prompt: t("decidim.proposals.proposals.edit.select_a_category") %>
-  </div>
-<% end %>
-
-<% if current_participatory_space.has_subscopes? %>
-  <div class="field">
-    <%= scopes_picker_field form, :scope_id %>
-  </div>
-<% end %>
-
-<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
-  <div class="field">
-    <%= user_group_select_field form, :user_group_id %>
-  </div>
-<% end %>
-
-<% if component_settings.attachments_allowed? && @proposal %>
-  <fieldset>
-    <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-    <%= form.fields_for :attachment, @form.attachment do |nested_form| %>
-
-      <div class="field">
-        <%= nested_form.upload :file, optional: false %>
-        <% if @form.errors[:attachment].present? %>
-          <% @form.errors[:attachment].each do |message| %>
-            <small class="form-error is-visible">
-              <%= message %>
-            </small>
-          <% end %>
-        <% end %>
-      </div>
-    <% end %>
-  </fieldset>
-<% end %>
diff --git a/app/views/decidim/proposals/proposals/complete.html.erb b/app/views/decidim/proposals/proposals/complete.html.erb
index 9d94dcf0..fb681a38 100644
--- a/app/views/decidim/proposals/proposals/complete.html.erb
+++ b/app/views/decidim/proposals/proposals/complete.html.erb
@@ -7,7 +7,7 @@
 
     <div class="card">
       <div class="card__content">
-        <%= decidim_form_for(@form) do |form| %>
+        <%= decidim_form_for(@form, url: update_draft_proposal_path(@proposal), method: :patch) do |form| %>
           <%= render partial: "edit_form_fields", locals: { form: form } %>
 
           <div class="actions">
diff --git a/app/views/decidim/proposals/proposals/edit_draft.html.erb b/app/views/decidim/proposals/proposals/edit_draft.html.erb
index 1ad47676..1dd418ee 100644
--- a/app/views/decidim/proposals/proposals/edit_draft.html.erb
+++ b/app/views/decidim/proposals/proposals/edit_draft.html.erb
@@ -7,7 +7,7 @@
 
     <div class="card">
       <div class="card__content">
-        <%= decidim_form_for(@form) do |form| %>
+        <%= decidim_form_for(@form, url: update_draft_proposal_path(@proposal), method: :patch) do |form| %>
           <%= render partial: "edit_form_fields", locals: { form: form } %>
 
           <div class="row column flex-center">