Merge branch 'polls' into polls-design

config/locales/admin.en.yml

@@ -191,11 +191,17 @@ en:
         questions_title: "List of questions"
         remove_question: "Remove question from poll"
         add_booth: "Assign booth"
+        add_question: "Include question"
         name: "Name"
         location: "Location"
         email: "Email"
         search_results: "Search results"
         no_search_results: "No results found"
+      flash:
+        question_added: "Question added to this poll"
+        error_on_question_added: "Question could not be assigned to this poll"
+        question_removed: "Question removed from this poll"
+        error_on_question_removed: "Question could not be removed from this poll"
     questions:
       index:
         title: "Questions"
@@ -309,6 +315,9 @@ en:
       booths_search:
         button: Search
         placeholder: Search booth by name
+      poll_questions_search:
+        button: Search
+        placeholder: Search poll questions
       proposal_search:
         button: Search
         placeholder: Search proposals by title, code, description or question

config/locales/admin.es.yml

@@ -191,11 +191,17 @@ es:
         questions_title: "Listado de preguntas asignadas"
         remove_question: "Desasignar pregunta"
         add_booth: "Asignar urna"
+        add_question: "Incluir pregunta"
         name: "Nombre"
         location: "Ubicación"
         email: "Email"
         search_results: "Resultados de la búsqueda"
         no_search_results: "No se han encontrado resultados"
+      flash:
+        question_added: "Pregunta añadida a esta votación"
+        error_on_question_added: "No se pudo asignar la pregunta"
+        question_removed: "Pregunta eliminada de esta votación"
+        error_on_question_removed: "No se pudo quitar la pregunta"
     questions:
       index:
         title: "Preguntas ciudadanas"
@@ -309,6 +315,9 @@ es:
       booths_search:
         button: Buscar
         placeholder: Buscar urna por nombre
+      poll_questions_search:
+        button: Buscar
+        placeholder: Buscar preguntas
       proposal_search:
         button: Buscar
         placeholder: Buscar propuestas por título, código, descripción o pregunta

config/routes.rb

@@ -189,6 +189,9 @@ Rails.application.routes.draw do
       end
       resources :polls do
         get :search_booths, on: :member
+        get :search_questions, on: :member
+        patch :add_question, on: :member
+        patch :remove_question, on: :member
       end
 
       resources :booths