Merge pull request #83 from decidim/issue_82

Implements fix for #82

Author: jsperezg

app/controllers/decidim/consultations/admin/application_controller.rb

@@ -6,6 +6,8 @@ module Admin
       # The main admin application controller for consultations
       class ApplicationController < Decidim::Admin::ApplicationController
         layout "decidim/admin/consultations"
+
+        helper Decidim::SanitizeHelper
       end
     end
   end

app/views/decidim/consultations/admin/questions/_form.html.erb

@@ -7,7 +7,7 @@
 
   <div class="card-section">
     <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true %>
+      <%= form.translated :editor, :title, toolbar: :full, lines: 5, autofocus: true %>
     </div>
 
     <div class="row column">

app/views/decidim/consultations/admin/questions/index.html.erb

@@ -23,7 +23,7 @@
             <tr>
               <td>
                 <% if can? :update, question %>
-                  <%= link_to translated_attribute(question.title),
+                  <%= link_to decidim_sanitize(translated_attribute(question.title)),
                               edit_question_path(question) %>
                   <br>
                 <% elsif can? :preview, question %>

app/views/decidim/consultations/consultations/_question.html.erb

@@ -3,7 +3,7 @@
     <div class="columns mediumlarge-8 large-9 card--process__column">
       <div class="card__content">
         <%= link_to decidim_consultations.question_path(question), class: "card__link" do %>
-          <h2 class="heading4"><%= translated_attribute question.title %></h2>
+          <h2 class="heading5"><%= decidim_sanitize translated_attribute question.title %></h2>
         <% end %>
         <p><%= translated_attribute question.subtitle %></p>
       </div>

app/views/decidim/consultations/questions/_right_column.html.erb

@@ -1,7 +1,7 @@
 <% add_decidim_meta_tags({
   image_url: current_participatory_space.hero_image_url,
   description: translated_attribute(current_participatory_space.question_context),
-  title: translated_attribute(current_participatory_space.title),
+  title: strip_tags(translated_attribute(current_participatory_space.title)),
   url: decidim_consultations.question_url(current_participatory_space),
   twitter_handler: current_organization.twitter_handler
 }) %>

app/views/layouts/decidim/_question_header.html.erb

@@ -21,7 +21,7 @@
 </div>
 
 <div class="row column consultations-title">
-  <h1 class="heading1"><%= translated_attribute question.title %></h1>
+  <h1 class="heading2"><%= decidim_sanitize translated_attribute question.title %></h1>
   <% unless question.hashtag.blank? %>
     <div class="text-center">
       <%= link_to "##{question.hashtag}", "https://twitter.com/hashtag/#{question.hashtag}" %>

spec/system/admin/admin_manages_questions_spec.rb

@@ -13,7 +13,7 @@
       click_link("New")
 
       within ".new_question" do
-        fill_in_i18n(
+        fill_in_i18n_editor(
           :question_title,
           "#question-title-tabs",
           en: "My question",
@@ -81,13 +81,6 @@
 
       within ".new_question" do
         fill_in :question_slug, with: "slug"
-        fill_in_i18n(
-          :question_title,
-          "#question-title-tabs",
-          en: "",
-          es: "",
-          ca: ""
-        )
         fill_in_i18n(
           :question_subtitle,
           "#question-subtitle-tabs",
@@ -141,7 +134,7 @@
       visit decidim_admin_consultations.consultation_questions_path(consultation)
       click_link translated(question.title)
 
-      fill_in_i18n(
+      fill_in_i18n_editor(
         :question_title,
         "#question-title-tabs",
         en: "My new title",
@@ -157,7 +150,7 @@
       expect(page).to have_admin_callout("successfully")
 
       within ".container" do
-        expect(page).to have_selector("input[value='My new title']")
+        expect(page).to have_i18n_content("My new title")
         expect(page).not_to have_css("img[src*='#{image2_filename}']")
         expect(page).to have_css("img[src*='#{image3_filename}']")
       end
@@ -172,8 +165,8 @@
       click_link translated(question.title)
 
       fill_in_i18n(
-        :question_title,
-        "#question-title-tabs",
+        :question_subtitle,
+        "#question-subtitle-tabs",
         en: "",
         es: "",
         ca: ""