From a83c259a04904c4448bfccd58818af7d1363fa99 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Wed, 4 Oct 2017 15:49:15 -0400 Subject: [PATCH 01/43] Remove 'description' attribute from Poll::Question This avoid an exception when seeding the database See PR #1977 --- db/dev_seeds.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index b151a45cf..3ce1a439f 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -559,7 +559,6 @@ print "Creating Poll Questions" open_at = rand(2.months.ago..2.months.from_now) question = Poll::Question.create!(author: author, title: Faker::Lorem.sentence(3).truncate(60), - description: description, valid_answers: Faker::Lorem.words((2..7).to_a.sample).join(', '), poll: poll) end From f4774894e7ee94a904c5501d3e2c30529b48ca9e Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Wed, 4 Oct 2017 16:59:23 -0400 Subject: [PATCH 02/43] Adapt Admin::Poll::Question 'show' action to new design MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes required as per issues #1855 and #1951 Fixes PR #1977, note n° 2 --- app/views/admin/poll/questions/show.html.erb | 48 +++++++++++--------- config/locales/en/admin.yml | 4 +- config/locales/es/admin.yml | 5 +- config/locales/fr/admin.yml | 10 ++-- 4 files changed, 40 insertions(+), 27 deletions(-) diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb index 7037afd5f..1cde20f5c 100644 --- a/app/views/admin/poll/questions/show.html.erb +++ b/app/views/admin/poll/questions/show.html.erb @@ -24,29 +24,35 @@ <%= link_to @question.author.name, user_path(@question.author) %>

- - - - - +
- <%= t('admin.questions.show.valid_answers') %> - - <%= link_to t("admin.questions.show.add_answer"), - new_admin_question_answer_path(@question), - class: "button hollow float-right" %> -
+ + + + + - - - - + + + + + + - <% @question.question_answers.each do |answer| %> - - - - - <% end %> + + <% @question.question_answers.each do |answer| %> + + + + + + <% end %> +
+ <%= t('admin.questions.show.valid_answers') %> + + <%= link_to t("admin.questions.show.add_answer"), + new_admin_question_answer_path(@question), + class: "button hollow float-right" %> +
<%= t("admin.questions.show.answers.title") %><%= t("admin.questions.show.answers.description") %>
<%= t("admin.questions.show.answers.title") %><%= t("admin.questions.show.answers.description") %><%= t("admin.questions.show.answers.videos") %>
<%= answer.title %><%= answer.description %>
<%= answer.title %><%= answer.description %><%= link_to t("admin.questions.show.answers.video_list", count: 0), "#" %>
<% if @question.video_url.present? %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 8202695f1..e28c7f40b 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -592,12 +592,14 @@ en: author: Author title: Title valid_answers: Valid answers - add_answer: "Add answer" + add_answer: Add answer video_url: External video documents: Documents (1) answers: title: Answer description: Description + videos: Videos + video_list: Video list (%{count}) answers: new: title: "New answer" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 3ff3abcb5..f025437cf 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -592,14 +592,15 @@ es: author: Autor title: Título valid_answers: Respuestas válidas - add_answer: "Añadir respuesta" - description: Descripción + add_answer: Añadir respuesta video_url: Video externo documents: Documentos (1) preview: Ver en la web answers: title: Respuesta description: Descripción + videos: Vídeos + video_list: Lista de vídeos (%{count}) answers: new: title: "Nueva respuesta" diff --git a/config/locales/fr/admin.yml b/config/locales/fr/admin.yml index e000c8a28..0217c9217 100644 --- a/config/locales/fr/admin.yml +++ b/config/locales/fr/admin.yml @@ -382,10 +382,14 @@ fr: author: Auteur title: Titre valid_answers: Réponses valides - add_answer: "Ajouter une réponse" - answer: "Réponse" - description: Description + add_answer: Ajouter une réponse + documents: Documents (1) preview: Voir l'aperçu + answers: + title: Réponse + description: Description + videos: Vidéos + video_list: Liste des vidéos (%{count}) answers: new: title: "Nouvelle réponse" From 32f3b643b009bda6e4c8bb654aa9d6a855967451 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Wed, 4 Oct 2017 17:25:51 -0400 Subject: [PATCH 03/43] Create 'poll_question_answer_videos' table and model --- app/models/poll/question/answer.rb | 1 + app/models/poll/question/answer/video.rb | 16 ++++++++++++++++ ...4210108_create_poll_question_answer_videos.rb | 11 +++++++++++ db/schema.rb | 11 ++++++++++- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 app/models/poll/question/answer/video.rb create mode 100644 db/migrate/20171004210108_create_poll_question_answer_videos.rb diff --git a/app/models/poll/question/answer.rb b/app/models/poll/question/answer.rb index 3f8f4a172..cb43e2d44 100644 --- a/app/models/poll/question/answer.rb +++ b/app/models/poll/question/answer.rb @@ -1,5 +1,6 @@ class Poll::Question::Answer < ActiveRecord::Base belongs_to :question, class_name: 'Poll::Question', foreign_key: 'question_id' + has_many :videos, class_name: 'Poll::Question::Answer::Video' validates :title, presence: true diff --git a/app/models/poll/question/answer/video.rb b/app/models/poll/question/answer/video.rb new file mode 100644 index 000000000..3d214af96 --- /dev/null +++ b/app/models/poll/question/answer/video.rb @@ -0,0 +1,16 @@ +class Poll::Question::Answer::Video < ActiveRecord::Base + belongs_to :answer, class_name: 'Poll::Question::Answer', foreign_key: 'answer_id' + + VIMEO_REGEX = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/ + YOUTUBE_REGEX = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/ + + validates :title, presence: true + validate :valid_url? + + def valid_url? + return if url.blank? + return if url.match(VIMEO_REGEX) + return if url.match(YOUTUBE_REGEX) + errors.add(:url, :invalid) + end +end diff --git a/db/migrate/20171004210108_create_poll_question_answer_videos.rb b/db/migrate/20171004210108_create_poll_question_answer_videos.rb new file mode 100644 index 000000000..7cce33b29 --- /dev/null +++ b/db/migrate/20171004210108_create_poll_question_answer_videos.rb @@ -0,0 +1,11 @@ +class CreatePollQuestionAnswerVideos < ActiveRecord::Migration + def change + create_table :poll_question_answer_videos do |t| + t.string :title + t.string :url + t.integer :answer_id, index: true + end + + add_foreign_key :poll_question_answer_videos, :poll_question_answers, column: :answer_id + end +end diff --git a/db/schema.rb b/db/schema.rb index dbbd3ec46..22e362a1f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171004151553) do +ActiveRecord::Schema.define(version: 20171004210108) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -668,6 +668,14 @@ ActiveRecord::Schema.define(version: 20171004151553) do add_index "poll_partial_results", ["origin"], name: "index_poll_partial_results_on_origin", using: :btree add_index "poll_partial_results", ["question_id"], name: "index_poll_partial_results_on_question_id", using: :btree + create_table "poll_question_answer_videos", force: :cascade do |t| + t.string "title" + t.string "url" + t.integer "answer_id" + end + + add_index "poll_question_answer_videos", ["answer_id"], name: "index_poll_question_answer_videos_on_answer_id", using: :btree + create_table "poll_question_answers", force: :cascade do |t| t.string "title" t.text "description" @@ -1152,6 +1160,7 @@ ActiveRecord::Schema.define(version: 20171004151553) do add_foreign_key "poll_partial_results", "poll_officer_assignments", column: "officer_assignment_id" add_foreign_key "poll_partial_results", "poll_questions", column: "question_id" add_foreign_key "poll_partial_results", "users", column: "author_id" + add_foreign_key "poll_question_answer_videos", "poll_question_answers", column: "answer_id" add_foreign_key "poll_question_answers", "poll_questions", column: "question_id" add_foreign_key "poll_questions", "polls" add_foreign_key "poll_questions", "proposals" From 5b129b933fc2cb3428ad58e3cd79debfb504ec5f Mon Sep 17 00:00:00 2001 From: iagirre Date: Thu, 5 Oct 2017 13:38:19 +0200 Subject: [PATCH 04/43] Removed documents from questions (documentable from model and uploader from _form in views) --- app/models/poll/question.rb | 5 ----- app/views/admin/poll/questions/_form.html.erb | 4 ---- 2 files changed, 9 deletions(-) diff --git a/app/models/poll/question.rb b/app/models/poll/question.rb index 1e94e0180..e6ef482a9 100644 --- a/app/models/poll/question.rb +++ b/app/models/poll/question.rb @@ -1,11 +1,6 @@ class Poll::Question < ActiveRecord::Base include Measurable include Searchable - include Documentable - documentable max_documents_allowed: 1, - max_file_size: 3.megabytes, - accepted_content_types: [ "application/pdf" ] - accepts_nested_attributes_for :documents, allow_destroy: true acts_as_paranoid column: :hidden_at include ActsAsParanoidAliases diff --git a/app/views/admin/poll/questions/_form.html.erb b/app/views/admin/poll/questions/_form.html.erb index 56b7ec93f..d97e498f6 100644 --- a/app/views/admin/poll/questions/_form.html.erb +++ b/app/views/admin/poll/questions/_form.html.erb @@ -16,10 +16,6 @@ <%= f.text_field :title, maxlength: Poll::Question.title_max_length %> -
- <%= render 'documents/nested_documents', documentable: @question, f: f %> -
-
<%= f.label :video_url, t("proposals.form.proposal_video_url") %>

<%= t("proposals.form.proposal_video_url_note") %>

From ab09bde7dd3481be9071f0c2bd9e865a2fbb9405 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Thu, 5 Oct 2017 08:11:15 -0400 Subject: [PATCH 05/43] Fix broken translations for Poll::Question::Answer model Poll::QuestionAnswer model was renamed to Poll::Question::Answer which made the previous I18n keys unavailable for the views See PR #1977, commit 461410a --- config/locales/en/activerecord.yml | 2 +- config/locales/es/activerecord.yml | 2 +- config/locales/fr/activerecord.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 5ef1917d3..6a6e2ad85 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -213,7 +213,7 @@ en: image: title: Title attachment: Attachment - poll/question_answer: + poll/question/answer: title: "Answer" description: "Description" errors: diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 9b3260680..9b83d9516 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -207,7 +207,7 @@ es: image: title: Título attachment: Archivo adjunto - poll/question_answer: + poll/question/answer: title: "Respuesta" description: "Descripción" errors: diff --git a/config/locales/fr/activerecord.yml b/config/locales/fr/activerecord.yml index d6ab5db80..5c6117d31 100644 --- a/config/locales/fr/activerecord.yml +++ b/config/locales/fr/activerecord.yml @@ -147,7 +147,7 @@ fr: name: Nom locale: Langue body: Contenu - poll/question_answer: + poll/question/answer: title: "Réponse" description: "Description" errors: From 75d841e2fe4da632c901ab2b745aba3bd1b2ee68 Mon Sep 17 00:00:00 2001 From: iagirre Date: Thu, 5 Oct 2017 15:31:21 +0200 Subject: [PATCH 06/43] Fixed the correct specs and views to make the test pass. --- app/views/admin/poll/questions/show.html.erb | 8 -------- spec/features/admin/poll/questions_spec.rb | 18 ------------------ 2 files changed, 26 deletions(-) diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb index 7037afd5f..959cc0fd4 100644 --- a/app/views/admin/poll/questions/show.html.erb +++ b/app/views/admin/poll/questions/show.html.erb @@ -56,13 +56,5 @@ <%= @question.video_url %>

<% end %> - - <% if @question.documents.any? %> -

- <%= t("admin.questions.show.documents") %> -
- <%= @question.documents.first.title %> -

- <% end %>
diff --git a/spec/features/admin/poll/questions_spec.rb b/spec/features/admin/poll/questions_spec.rb index 7e103c647..5c8cba9c1 100644 --- a/spec/features/admin/poll/questions_spec.rb +++ b/spec/features/admin/poll/questions_spec.rb @@ -111,22 +111,4 @@ feature 'Admin poll questions' do pending "Mark all city by default when creating a poll question from a successful proposal" - it_behaves_like "nested documentable", - "administrator", - "poll_question", - "new_admin_question_path", - { }, - "documentable_fill_new_valid_poll_question", - "Save", - "Star Wars: Episode IV - A New Hope" - - it_behaves_like "nested documentable", - "administrator", - "poll_question", - "edit_admin_question_path", - { "id": "id" }, - nil, - "Save", - "Changes saved" - end From 82cf1fc28526133c4c3a0d425c4ddb8219125ae0 Mon Sep 17 00:00:00 2001 From: iagirre Date: Thu, 5 Oct 2017 15:55:37 +0200 Subject: [PATCH 07/43] Remove unused i18n-keys: admin.questions.show.documents, value: Documents(1) (en and es) --- config/locales/en/admin.yml | 1 - config/locales/es/admin.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 8202695f1..6446c0d05 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -594,7 +594,6 @@ en: valid_answers: Valid answers add_answer: "Add answer" video_url: External video - documents: Documents (1) answers: title: Answer description: Description diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 3ff3abcb5..1d5f6b86d 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -595,7 +595,6 @@ es: add_answer: "Añadir respuesta" description: Descripción video_url: Video externo - documents: Documentos (1) preview: Ver en la web answers: title: Respuesta From 5f6d218a15542b8a213e099881fae49e557f5073 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Thu, 5 Oct 2017 10:32:09 -0400 Subject: [PATCH 08/43] Rename param in Admin::Poll::Questions::AnswersController 'poll_question_id' attribute was renamed to 'question_id' on PR #1977, commit 4aaf681 --- app/controllers/admin/poll/questions/answers_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/poll/questions/answers_controller.rb b/app/controllers/admin/poll/questions/answers_controller.rb index d0a7c4cc7..660339844 100644 --- a/app/controllers/admin/poll/questions/answers_controller.rb +++ b/app/controllers/admin/poll/questions/answers_controller.rb @@ -21,7 +21,7 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController private def answer_params - params.require(:poll_question_answer).permit(:title, :description, :poll_question_id) + params.require(:poll_question_answer).permit(:title, :description, :question_id) end def load_question From b31abb64d75a8028f75eedf2999b2084f961c563 Mon Sep 17 00:00:00 2001 From: iagirre Date: Thu, 5 Oct 2017 17:28:24 +0200 Subject: [PATCH 09/43] Removed the methods not used from nested_documentable specs (the ones that were deleted in the questions specs) and removed also the document params from questions_params (not used anymore). --- app/controllers/admin/poll/questions_controller.rb | 3 +-- spec/shared/features/nested_documentable.rb | 8 +------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/controllers/admin/poll/questions_controller.rb b/app/controllers/admin/poll/questions_controller.rb index 107c06740..5cf587735 100644 --- a/app/controllers/admin/poll/questions_controller.rb +++ b/app/controllers/admin/poll/questions_controller.rb @@ -56,8 +56,7 @@ class Admin::Poll::QuestionsController < Admin::Poll::BaseController private def question_params - params.require(:poll_question).permit(:poll_id, :title, :question, :proposal_id, :valid_answers, :video_url, - documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) + params.require(:poll_question).permit(:poll_id, :title, :question, :proposal_id, :valid_answers, :video_url) end def search_params diff --git a/spec/shared/features/nested_documentable.rb b/spec/shared/features/nested_documentable.rb index 8780936a7..255f018e5 100644 --- a/spec/shared/features/nested_documentable.rb +++ b/spec/shared/features/nested_documentable.rb @@ -263,7 +263,6 @@ shared_examples "nested documentable" do |login_as_name, documentable_factory_na end - end end @@ -275,7 +274,7 @@ rescue return end -def documentable_attach_new_file(documentable_factory_name, index, path, success = true) +def documentable_attach_new_file(_documentable_factory_name, index, path, success = true) click_link "Add new document" document = all(".document")[index] document_input = document.find("input[type=file]", visible: false) @@ -318,8 +317,3 @@ def documentable_fill_new_valid_budget_investment fill_in_ckeditor "budget_investment_description", with: "Budget investment description" check :budget_investment_terms_of_service end - -def documentable_fill_new_valid_poll_question - page.select documentable.poll.name, from: 'poll_question_poll_id' - fill_in 'poll_question_title', with: "Star Wars: Episode IV - A New Hope" -end From 5862eea516c2cb03bb11e29c04952b0b3b1b1908 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Thu, 5 Oct 2017 12:34:20 -0400 Subject: [PATCH 10/43] Add controllers/views for Poll::Question::Answer::Video --- .../questions/answers/videos_controller.rb | 57 +++++++++++++++++++ .../questions/answers/videos/_form.html.erb | 21 +++++++ .../questions/answers/videos/edit.html.erb | 9 +++ .../questions/answers/videos/index.html.erb | 47 +++++++++++++++ .../questions/answers/videos/new.html.erb | 9 +++ app/views/admin/poll/questions/show.html.erb | 16 +++--- config/locales/en/activerecord.yml | 3 + config/locales/en/admin.yml | 12 +++- config/locales/en/responders.yml | 2 + config/locales/es/activerecord.yml | 3 + config/locales/es/admin.yml | 10 ++++ config/locales/es/responders.yml | 2 + config/locales/fr/activerecord.yml | 3 + config/locales/fr/admin.yml | 10 ++++ config/locales/fr/responders.yml | 3 + config/routes.rb | 6 +- .../questions/answers/videos/videos_spec.rb | 33 +++++++++++ 17 files changed, 236 insertions(+), 10 deletions(-) create mode 100644 app/controllers/admin/poll/questions/answers/videos_controller.rb create mode 100644 app/views/admin/poll/questions/answers/videos/_form.html.erb create mode 100644 app/views/admin/poll/questions/answers/videos/edit.html.erb create mode 100644 app/views/admin/poll/questions/answers/videos/index.html.erb create mode 100644 app/views/admin/poll/questions/answers/videos/new.html.erb create mode 100644 spec/features/admin/poll/questions/answers/videos/videos_spec.rb diff --git a/app/controllers/admin/poll/questions/answers/videos_controller.rb b/app/controllers/admin/poll/questions/answers/videos_controller.rb new file mode 100644 index 000000000..a231c1a20 --- /dev/null +++ b/app/controllers/admin/poll/questions/answers/videos_controller.rb @@ -0,0 +1,57 @@ +class Admin::Poll::Questions::Answers::VideosController < Admin::Poll::BaseController + before_action :load_answer, only: [:index, :new, :create] + before_action :load_video, only: [:edit, :update, :destroy] + + def index + end + + def new + @video = ::Poll::Question::Answer::Video.new + end + + def create + @video = ::Poll::Question::Answer::Video.new(video_params) + + if @video.save + redirect_to admin_answer_videos_path(@answer), + notice: t("flash.actions.create.poll_question_answer_video") + else + render :new + end + end + + def edit + end + + def update + if @video.update(video_params) + redirect_to admin_answer_videos_path(@video.answer_id), + notice: t("flash.actions.save_changes.notice") + else + render :edit + end + end + + def destroy + if @video.destroy + notice = t("flash.actions.destroy.poll_question_answer_video") + else + notice = t("flash.actions.destroy.error") + end + redirect_to :back, notice: notice + end + + private + + def video_params + params.require(:poll_question_answer_video).permit(:title, :url, :answer_id) + end + + def load_answer + @answer = ::Poll::Question::Answer.find(params[:answer_id]) + end + + def load_video + @video = ::Poll::Question::Answer::Video.find(params[:id]) + end +end diff --git a/app/views/admin/poll/questions/answers/videos/_form.html.erb b/app/views/admin/poll/questions/answers/videos/_form.html.erb new file mode 100644 index 000000000..28035c397 --- /dev/null +++ b/app/views/admin/poll/questions/answers/videos/_form.html.erb @@ -0,0 +1,21 @@ +<%= form_for(@video, url: form_url) do |f| %> + + <%= render 'shared/errors', resource: @video %> + + <%= f.hidden_field :answer_id, value: @video.answer_id || @answer.id %> + +
+
+ + <%= f.text_field :title %> + <%= f.text_field :url %> + +
+
+ <%= f.submit(class: "button expanded", value: t("shared.save")) %> +
+
+ +
+
+<% end %> diff --git a/app/views/admin/poll/questions/answers/videos/edit.html.erb b/app/views/admin/poll/questions/answers/videos/edit.html.erb new file mode 100644 index 000000000..31b59c2dd --- /dev/null +++ b/app/views/admin/poll/questions/answers/videos/edit.html.erb @@ -0,0 +1,9 @@ +<%= back_link_to %> + +

+ <%= t("admin.answers.videos.edit.title") %> +

+ +
+ <%= render "form", form_url: admin_video_path(@video) %> +
diff --git a/app/views/admin/poll/questions/answers/videos/index.html.erb b/app/views/admin/poll/questions/answers/videos/index.html.erb new file mode 100644 index 000000000..0ea64c570 --- /dev/null +++ b/app/views/admin/poll/questions/answers/videos/index.html.erb @@ -0,0 +1,47 @@ +<%= back_link_to admin_question_path(@answer.question_id) %> + +
+ +

+ <%= t("admin.answers.videos.index.title") %> +

+ +<%= link_to t("admin.answers.videos.index.add_video"), + new_admin_answer_video_path, + class: "button success float-right" %> + +
+ + + + + + + + + + + + <% @answer.videos.each do |video| %> + + + + + + <% end %> + +
<%= t("admin.answers.videos.index.video_title") %><%= t("admin.answers.videos.index.video_url") %> + <%= t("admin.actions.actions") %> +
<%= video.title %><%= link_to "#{video.url}", video.url %> + + <%= link_to t("shared.edit"), + edit_admin_video_path(video), + class: "button hollow" %> + + <%= link_to t("shared.delete"), + admin_video_path(video), + class: "button hollow alert", + method: :delete %> +
+ +
diff --git a/app/views/admin/poll/questions/answers/videos/new.html.erb b/app/views/admin/poll/questions/answers/videos/new.html.erb new file mode 100644 index 000000000..d114b9104 --- /dev/null +++ b/app/views/admin/poll/questions/answers/videos/new.html.erb @@ -0,0 +1,9 @@ +<%= back_link_to admin_answer_videos_path(@answer) %> + +

+ <%= t('admin.answers.videos.new.title') %> +

+ +
+ <%= render "form", form_url: admin_answer_videos_path %> +
diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb index 1cde20f5c..84a07622f 100644 --- a/app/views/admin/poll/questions/show.html.erb +++ b/app/views/admin/poll/questions/show.html.erb @@ -24,13 +24,13 @@ <%= link_to @question.author.name, user_path(@question.author) %>

- +
- - - - - + + + @@ -49,7 +49,9 @@ - + <% end %> diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 6a6e2ad85..f6b6be383 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -216,6 +216,9 @@ en: poll/question/answer: title: "Answer" description: "Description" + poll/question/answer/video: + title: Title + url: External video errors: models: user: diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index e28c7f40b..981eca84e 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -602,7 +602,17 @@ en: video_list: Video list (%{count}) answers: new: - title: "New answer" + title: New answer + videos: + index: + title: Videos + add_video: Add video + video_title: Title + video_url: External video + new: + title: New video + edit: + title: Edit video recounts: index: title: "Recounts" diff --git a/config/locales/en/responders.yml b/config/locales/en/responders.yml index fd187c495..88f68a955 100644 --- a/config/locales/en/responders.yml +++ b/config/locales/en/responders.yml @@ -9,6 +9,7 @@ en: poll: "Poll created successfully." poll_booth: "Booth created successfully." poll_question_answer: "Answer created successfully" + poll_question_answer_video: "Video created successfully" proposal: "Proposal created successfully." proposal_notification: "Your message has been sent correctly." spending_proposal: "Spending proposal created successfully. You can access it from %{activity}" @@ -31,3 +32,4 @@ en: budget_investment: "Investment project deleted succesfully." error: "Could not delete" topic: "Topic deleted successfully." + poll_question_answer_video: "Answer video deleted successfully." diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 9b83d9516..d04eb72da 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -210,6 +210,9 @@ es: poll/question/answer: title: "Respuesta" description: "Descripción" + poll/question/answer/video: + title: Título + url: Vídeo externo errors: models: user: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index f025437cf..f57c4fbea 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -606,6 +606,16 @@ es: title: "Nueva respuesta" video_url: Video externo documents: Documentos (1) + videos: + index: + title: Vídeos + add_video: Añadir vídeo + video_title: Título + video_url: External video + new: + title: Nuevo video + edit: + title: Editar vídeo recounts: index: title: "Recuentos" diff --git a/config/locales/es/responders.yml b/config/locales/es/responders.yml index a35387ff3..01f19d96e 100644 --- a/config/locales/es/responders.yml +++ b/config/locales/es/responders.yml @@ -9,6 +9,7 @@ es: poll: "Votación creada correctamente." poll_booth: "Urna creada correctamente." poll_question_answer: "Respuesta creada correctamente" + poll_question_answer_video: "Vídeo creado correctamente" proposal: "Propuesta creada correctamente." proposal_notification: "Tu message ha sido enviado correctamente." spending_proposal: "Propuesta de inversión creada correctamente. Puedes acceder a ella desde %{activity}" @@ -31,3 +32,4 @@ es: budget_investment: "Propuesta de inversión eliminada." error: "No se pudo borrar" topic: "Tema eliminado." + poll_question_answer_video: "Vídeo de respuesta eliminado." diff --git a/config/locales/fr/activerecord.yml b/config/locales/fr/activerecord.yml index 5c6117d31..bd8acfd50 100644 --- a/config/locales/fr/activerecord.yml +++ b/config/locales/fr/activerecord.yml @@ -150,6 +150,9 @@ fr: poll/question/answer: title: "Réponse" description: "Description" + poll/question/answer/video: + title: Titre + url: Vidéo externe errors: models: user: diff --git a/config/locales/fr/admin.yml b/config/locales/fr/admin.yml index 0217c9217..ba29e068b 100644 --- a/config/locales/fr/admin.yml +++ b/config/locales/fr/admin.yml @@ -393,6 +393,16 @@ fr: answers: new: title: "Nouvelle réponse" + videos: + index: + title: Vidéos + add_video: Ajouter une vidéo + video_title: Titre + video_url: Vidéo externe + new: + title: Nouveau vidéo + edit: + title: Modifier la vidéo recounts: index: title: "Dépouillements" diff --git a/config/locales/fr/responders.yml b/config/locales/fr/responders.yml index 9897e3455..1d1cfae0c 100644 --- a/config/locales/fr/responders.yml +++ b/config/locales/fr/responders.yml @@ -8,6 +8,8 @@ fr: direct_message: "Votre message a été envoyé avec succès." poll: "Vote créé avec succès." poll_booth: "Urne créée avec succès." + poll_question_answer: "Réponse créée avec succès" + poll_question_answer_video: "Vidéo créée avec succès" proposal: "Proposition créée avec succès." proposal_notification: "Votre message a correctement été envoyé." spending_proposal: "Proposition de dépense créée avec succès. Vous pouvez y accéder depuis %{activity}" @@ -27,3 +29,4 @@ fr: spending_proposal: "Proposition de dépense supprimée avec succès." budget_investment: "Budget d'investissement supprimé avec succès." error: "Suppression impossible" + poll_question_answer_video: "Réponse vidéo supprimée avec succès." diff --git a/config/routes.rb b/config/routes.rb index 89691feac..1428dc4fa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -300,8 +300,10 @@ Rails.application.routes.draw do end end - resources :questions do - resources :answers, only: [:new, :create], controller: 'questions/answers' + resources :questions, shallow: true do + resources :answers, only: [:new, :create], controller: 'questions/answers' do + resources :videos, controller: 'questions/answers/videos' + end end end diff --git a/spec/features/admin/poll/questions/answers/videos/videos_spec.rb b/spec/features/admin/poll/questions/answers/videos/videos_spec.rb new file mode 100644 index 000000000..ee04ce128 --- /dev/null +++ b/spec/features/admin/poll/questions/answers/videos/videos_spec.rb @@ -0,0 +1,33 @@ +require 'rails_helper' + +feature 'Videos' do + + background do + admin = create(:administrator) + login_as(admin.user) + end + + scenario "Create" do + question = create(:poll_question) + answer = create(:poll_question_answer, question: question) + video_title = "'Magical' by Junko Ohashi" + video_url = "https://www.youtube.com/watch?v=-JMf43st-1A" + + visit admin_question_path(question) + + within("#poll_question_answer_#{answer.id}") do + click_link "Video list (#{answer.videos.count})" + end + + click_link "Add video" + + fill_in 'poll_question_answer_video_title', with: video_title + fill_in 'poll_question_answer_video_url', with: video_url + + click_button "Save" + + expect(page).to have_content(video_title) + expect(page).to have_content(video_url) + end + +end From 0cf5299846ce095a2cae958532949019ba570009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 6 Oct 2017 00:04:25 +0200 Subject: [PATCH 11/43] Set voting messages --- app/views/polls/questions/_answers.html.erb | 4 ++-- app/views/polls/show.html.erb | 5 +++++ config/locales/en/general.yml | 3 ++- config/locales/es/general.yml | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/views/polls/questions/_answers.html.erb b/app/views/polls/questions/_answers.html.erb index 2bef6de72..ccc9f0322 100644 --- a/app/views/polls/questions/_answers.html.erb +++ b/app/views/polls/questions/_answers.html.erb @@ -2,8 +2,8 @@ <% if can? :answer, question %> <% question.question_answers.each do |answer| %> <% if @answers_by_question_id[question.id] == answer.title %> - "> + "> <%= answer.title %> <% else %> diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index b3a78e402..894899a72 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -38,6 +38,11 @@ <%= t("polls.show.already_voted_in_booth") %> <% else %> + <% if current_user && !@poll.votable_by?(current_user) %> +
+ <%= t("polls.show.already_voted_in_web") %> +
+ <% end %> <% @questions.each do |question| %> <%= render 'polls/questions/question', question: question %> <% end %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 1796049eb..473ac7391 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -481,7 +481,8 @@ en: help_text_1: "Voting takes place when a citizen proposal supports reaches 1% of the census with voting rights. Voting can also include questions that the City Council ask to the citizens decision." help_text_2: "To participate in the next vote you have to sign up on %{org} and verify your account. All registered voters in the city over 16 years old can vote. The results of all votes are binding on the government." show: - already_voted_in_booth: "You have already participated in a booth for this poll." + already_voted_in_booth: "You have already participated in a physical booth. You can not participate again." + already_voted_in_web: "You have already participated in this poll. If you vote again it will be overwritten." back: Back to voting cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate." signin: Sign in diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index d5997e746..0af33da1d 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -481,7 +481,8 @@ es: help_text_1: "Las votaciones se convocan cuando una propuesta ciudadana alcanza el 1% de apoyos del censo con derecho a voto. En las votaciones también se pueden incluir cuestiones que el Ayuntamiento somete a decisión directa de la ciudadanía." help_text_2: "Para participar en la próxima votación tienes que registrarte en %{org} y verificar tu cuenta. Pueden votar todas las personas empadronadas en la ciudad mayores de 16 años. Los resultados de todas las votaciones serán vinculantes para el gobierno." show: - already_voted_in_booth: "Ya has participado en esta votación en una urna." + already_voted_in_booth: "Ya has participado en esta votación en urnas presenciales, no puedes volver a participar." + already_voted_in_web: "Ya has participado en esta votación. Si vuelves a votar se sobreescribirá tu resultado anterior." back: Volver a votaciones cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar." signin: iniciar sesión From 6192ea8b780e46b1e5711bb278ef20602b7c2887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 5 Oct 2017 15:19:09 +0200 Subject: [PATCH 12/43] Added documents to Poll::Question::Answer --- app/models/poll/question/answer.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/poll/question/answer.rb b/app/models/poll/question/answer.rb index 1746c480c..e1da38fe8 100644 --- a/app/models/poll/question/answer.rb +++ b/app/models/poll/question/answer.rb @@ -1,5 +1,10 @@ class Poll::Question::Answer < ActiveRecord::Base include Galleryable + include Documentable + documentable max_documents_allowed: 3, + max_file_size: 3.megabytes, + accepted_content_types: [ "application/pdf" ] + accepts_nested_attributes_for :documents, allow_destroy: true belongs_to :question, class_name: 'Poll::Question', foreign_key: 'question_id' From 590344a576fb777be429709925738ffff76ac3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 5 Oct 2017 15:20:09 +0200 Subject: [PATCH 13/43] Added view to upload documents to poll answers --- .../poll/questions/answers_controller.rb | 21 +++++++- .../poll/questions/answers/documents.html.erb | 51 +++++++++++++++++++ config/routes.rb | 4 +- 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 app/views/admin/poll/questions/answers/documents.html.erb diff --git a/app/controllers/admin/poll/questions/answers_controller.rb b/app/controllers/admin/poll/questions/answers_controller.rb index 660339844..9223e65d4 100644 --- a/app/controllers/admin/poll/questions/answers_controller.rb +++ b/app/controllers/admin/poll/questions/answers_controller.rb @@ -1,5 +1,6 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController before_action :load_question + before_action :load_answer, only: [:update, :documents] load_and_authorize_resource :question, class: "::Poll::Question" @@ -18,10 +19,28 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController end end + def update + if @answer.update(answer_params) + redirect_to admin_question_path(@question), notice: t("flash.actions.save_changes.notice") + else + redirect_to :back + end + end + + def documents + @documents = @answer.documents + + render 'admin/poll/questions/answers/documents' + end + private def answer_params - params.require(:poll_question_answer).permit(:title, :description, :question_id) + params.require(:poll_question_answer).permit(:title, :description, :question_id, documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) + end + + def load_answer + @answer = ::Poll::Question::Answer.find(params[:id] || params[:answer_id]) end def load_question diff --git a/app/views/admin/poll/questions/answers/documents.html.erb b/app/views/admin/poll/questions/answers/documents.html.erb new file mode 100644 index 000000000..17c6f52a3 --- /dev/null +++ b/app/views/admin/poll/questions/answers/documents.html.erb @@ -0,0 +1,51 @@ +

<%= link_to @question.title, admin_question_path(@question) %> > <%= @answer.title %>

+ + +

<%= t("admin.questions.show.answers.documents_list") %>

+ +
+ <%= form_for(@answer, url: admin_question_answer_path(@question, @answer)) do |f| %> + + <%= render 'shared/errors', resource: @answer %> + + <%= f.hidden_field :question_id, value: @question.id %> + +
+
+
+ <%= render 'documents/nested_documents', documentable: @answer, f: f %> +
+ +
+
+ <%= f.submit(class: "button expanded", value: t("shared.save")) %> +
+
+
+
+ <% end %> + + <% if @answer.documents.present? %> +
+ <%= t('admin.questions.show.valid_answers') %> + <%= link_to t("admin.questions.show.add_answer"), new_admin_question_answer_path(@question), class: "button hollow float-right" %> @@ -38,9 +38,9 @@
<%= t("admin.questions.show.answers.title") %><%= t("admin.questions.show.answers.description") %><%= t("admin.questions.show.answers.videos") %><%= t("admin.questions.show.answers.title") %><%= t("admin.questions.show.answers.description") %><%= t("admin.questions.show.answers.videos") %>
<%= answer.title %> <%= answer.description %><%= link_to t("admin.questions.show.answers.video_list", count: 0), "#" %><%= link_to t("admin.questions.show.answers.video_list", + count: answer.videos.count), + admin_answer_videos_path(answer) %>
+ + + + + + <% @answer.documents.each do |document| %> + + + + + <% end %> +
<%= t("admin.questions.show.answers.document_title") %><%= t("admin.questions.show.answers.description") %>
+ <%= link_to document.title, document.attachment.url %> + + <%= link_to t('documents.buttons.download_document'), + document.attachment.url, + target: "_blank", + rel: "nofollow", + class: 'button hollow' %> +
+ <% end %> + diff --git a/config/routes.rb b/config/routes.rb index 387983d4b..57f79f115 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -301,10 +301,10 @@ Rails.application.routes.draw do end resources :questions do - resources :answers, only: [:new, :create], controller: 'questions/answers', shallow: true do + resources :answers, only: [:new, :create, :update], controller: 'questions/answers', shallow: true do resources :images, controller: 'questions/answers/images' + get :documents, to: 'questions/answers#documents' end - end end From c3f778bbdde2bc5c1c115e589d69142221cde40a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 6 Oct 2017 01:18:56 +0200 Subject: [PATCH 14/43] Check if user has voted before sign in --- app/helpers/polls_helper.rb | 4 ++++ app/views/polls/questions/_answers.html.erb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/helpers/polls_helper.rb b/app/helpers/polls_helper.rb index 27d33ea04..a676084cb 100644 --- a/app/helpers/polls_helper.rb +++ b/app/helpers/polls_helper.rb @@ -41,4 +41,8 @@ module PollsHelper booth.name + location end + def voted_before_sign_in(question) + current_user.current_sign_in_at >= question.poll.voters.find_by_user_id(current_user).updated_at + end + end diff --git a/app/views/polls/questions/_answers.html.erb b/app/views/polls/questions/_answers.html.erb index ccc9f0322..7fb4a5d71 100644 --- a/app/views/polls/questions/_answers.html.erb +++ b/app/views/polls/questions/_answers.html.erb @@ -1,7 +1,7 @@
<% if can? :answer, question %> <% question.question_answers.each do |answer| %> - <% if @answers_by_question_id[question.id] == answer.title %> + <% if @answers_by_question_id[question.id] == answer.title && !voted_before_sign_in(question) %> "> <%= answer.title %> From 284fdea2e6aed813eaf16ddfd569e0ebb0ee3f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 5 Oct 2017 15:41:55 +0200 Subject: [PATCH 15/43] Improved answer documents and question summary views --- .../poll/questions/answers/documents.html.erb | 5 +++-- app/views/admin/poll/questions/show.html.erb | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/views/admin/poll/questions/answers/documents.html.erb b/app/views/admin/poll/questions/answers/documents.html.erb index 17c6f52a3..28b55a2a3 100644 --- a/app/views/admin/poll/questions/answers/documents.html.erb +++ b/app/views/admin/poll/questions/answers/documents.html.erb @@ -1,8 +1,9 @@ -

<%= link_to @question.title, admin_question_path(@question) %> > <%= @answer.title %>

- +<%= back_link_to %>

<%= t("admin.questions.show.answers.documents_list") %>

+

<%= link_to @question.poll.name, admin_poll_path(@question.poll) %> > <%= link_to @question.title, admin_question_path(@question) %> > <%= @answer.title %>

+
<%= form_for(@answer, url: admin_question_answer_path(@question, @answer)) do |f| %> diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb index 64c30de1e..0a89bf915 100644 --- a/app/views/admin/poll/questions/show.html.erb +++ b/app/views/admin/poll/questions/show.html.erb @@ -31,7 +31,7 @@ - - - + + + <% @question.question_answers.each do |answer| %> @@ -50,10 +51,17 @@ + <% end %>
+ <%= t('admin.questions.show.valid_answers') %> <%= link_to t("admin.questions.show.add_answer"), new_admin_question_answer_path(@question), @@ -41,8 +41,9 @@
<%= t("admin.questions.show.answers.title") %><%= t("admin.questions.show.answers.description") %><%= t("admin.questions.show.answers.images") %><%= t("admin.questions.show.answers.description") %><%= t("admin.questions.show.answers.images") %><%= t("admin.questions.show.answers.documents") %>
<%= answer.title %> <%= answer.description %> - (<%= answer.images.count %>)
+ (<%= answer.images.count %>) +
<%= link_to t("admin.questions.show.answers.images_list"), admin_answer_images_path(answer) %> 		+ (<%= answer.documents.count rescue 0 %>) +
+ <%= link_to t("admin.questions.show.answers.documents_list"), + admin_question_answer_documents_path(@question, answer) %> +
From 37c9ca09737cf0d7efae2467f0e54799b7850365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 5 Oct 2017 15:42:12 +0200 Subject: [PATCH 16/43] Fixed admin menu --- app/views/admin/_menu.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 81e1ae9bd..21dc7cffb 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -53,7 +53,6 @@ <% end %> - <% if feature?(:polls) %>
  • From d20a4909d61b764b304ba40a3bff3d67a46332d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 5 Oct 2017 15:42:54 +0200 Subject: [PATCH 17/43] Minor fix Removed left margin from submit button --- app/views/admin/poll/questions/answers/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/poll/questions/answers/_form.html.erb b/app/views/admin/poll/questions/answers/_form.html.erb index 72ffb4771..fc16e7e36 100644 --- a/app/views/admin/poll/questions/answers/_form.html.erb +++ b/app/views/admin/poll/questions/answers/_form.html.erb @@ -15,7 +15,7 @@ label: false %>
    • -
    +
    <%= f.submit(class: "button expanded", value: t("shared.save")) %>
    From a655466dbfdab552e00e908bd3dcbb2bd008d424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 5 Oct 2017 15:45:01 +0200 Subject: [PATCH 18/43] Added new translations --- config/locales/en/admin.yml | 5 ++++- config/locales/es/admin.yml | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 02d8bacdd..d4dc0500c 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -601,12 +601,15 @@ en: valid_answers: Valid answers add_answer: "Add answer" video_url: External video - documents: Documents (1) + documents: Documents answers: title: Answer description: Description images: Images images_list: Images list + documents: Documents + documents_list: Documents list + document_title: Title answers: new: title: "New answer" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 9e0de770e..df18830fd 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -602,13 +602,15 @@ es: add_answer: "Añadir respuesta" description: Descripción video_url: Video externo - documents: Documentos (1) - preview: Ver en la web + documents: Documentos answers: title: Respuesta description: Descripción images: Imágenes images_list: Lista de imágenes + documents: Documentos + documents_list: Lista de documentos + document_title: Título answers: new: title: "Nueva respuesta" From 1225fc90094f864c03b4cb4115f2b42a556b74ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 5 Oct 2017 16:22:45 +0200 Subject: [PATCH 19/43] Minor fix --- app/views/admin/poll/questions/answers/documents.html.erb | 2 +- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/admin/poll/questions/answers/documents.html.erb b/app/views/admin/poll/questions/answers/documents.html.erb index 28b55a2a3..4c859a78d 100644 --- a/app/views/admin/poll/questions/answers/documents.html.erb +++ b/app/views/admin/poll/questions/answers/documents.html.erb @@ -30,7 +30,7 @@ - + <% @answer.documents.each do |document| %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index d4dc0500c..d50e38fe8 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -610,6 +610,7 @@ en: documents: Documents documents_list: Documents list document_title: Title + document_actions: Actions answers: new: title: "New answer" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index df18830fd..40587f30d 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -611,6 +611,7 @@ es: documents: Documentos documents_list: Lista de documentos document_title: Título + document_actions: Acciones answers: new: title: "Nueva respuesta" From b8f2fd1c54e75f6792993fd3f7d89df295e60cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 5 Oct 2017 17:34:10 +0200 Subject: [PATCH 20/43] Markup fixes --- .../admin/poll/questions/answers/documents.html.erb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/views/admin/poll/questions/answers/documents.html.erb b/app/views/admin/poll/questions/answers/documents.html.erb index 4c859a78d..d9036b163 100644 --- a/app/views/admin/poll/questions/answers/documents.html.erb +++ b/app/views/admin/poll/questions/answers/documents.html.erb @@ -2,7 +2,11 @@

    <%= t("admin.questions.show.answers.documents_list") %>

    -

    <%= link_to @question.poll.name, admin_poll_path(@question.poll) %> > <%= link_to @question.title, admin_question_path(@question) %> > <%= @answer.title %>

    +
      +
    • <%= link_to @question.poll.name, admin_poll_path(@question.poll) %>
      • +
    • <%= link_to @question.title, admin_question_path(@question) %>
      • +
    • <%= @answer.title %>
      • +
    <%= form_for(@answer, url: admin_question_answer_path(@question, @answer)) do |f| %> @@ -30,15 +34,15 @@
    <%= t("admin.questions.show.answers.document_title") %><%= t("admin.questions.show.answers.description") %><%= t("admin.questions.show.answers.document_actions") %>
    - + <% @answer.documents.each do |document| %> - - <% end %> From 78569152034c58bf756913e78693717acd894384 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 6 Oct 2017 02:38:43 +0200 Subject: [PATCH 22/43] removes @question on questions answers --- .../admin/poll/questions/answers_controller.rb | 4 ---- .../admin/poll/questions/answers/documents.html.erb | 11 +++++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/controllers/admin/poll/questions/answers_controller.rb b/app/controllers/admin/poll/questions/answers_controller.rb index 9223e65d4..e4d8869c0 100644 --- a/app/controllers/admin/poll/questions/answers_controller.rb +++ b/app/controllers/admin/poll/questions/answers_controller.rb @@ -1,5 +1,4 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController - before_action :load_question before_action :load_answer, only: [:update, :documents] load_and_authorize_resource :question, class: "::Poll::Question" @@ -43,7 +42,4 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController @answer = ::Poll::Question::Answer.find(params[:id] || params[:answer_id]) end - def load_question - @question = ::Poll::Question.find(params[:question_id]) - end end diff --git a/app/views/admin/poll/questions/answers/documents.html.erb b/app/views/admin/poll/questions/answers/documents.html.erb index d9036b163..ba2a6193b 100644 --- a/app/views/admin/poll/questions/answers/documents.html.erb +++ b/app/views/admin/poll/questions/answers/documents.html.erb @@ -3,18 +3,17 @@

    <%= t("admin.questions.show.answers.documents_list") %>

      -
    • <%= link_to @question.poll.name, admin_poll_path(@question.poll) %>
      • -
    • <%= link_to @question.title, admin_question_path(@question) %>
      • +
    • <%= @answer.question.title %>
    • <%= @answer.title %>
    -
    - <%= form_for(@answer, url: admin_question_answer_path(@question, @answer)) do |f| %> +
    + <%= form_for(Poll::Question::Answer.new, + url: admin_answer_documents_path(@answer), + method: :post) do |f| %> <%= render 'shared/errors', resource: @answer %> - <%= f.hidden_field :question_id, value: @question.id %> -
    From a15d1a4020c27aac1843c002c3a836af645174f1 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 6 Oct 2017 02:52:06 +0200 Subject: [PATCH 23/43] resolves conflict when uploading pdfs to answers --- app/models/direct_upload.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/direct_upload.rb b/app/models/direct_upload.rb index 192f06d04..cbd98f3d2 100644 --- a/app/models/direct_upload.rb +++ b/app/models/direct_upload.rb @@ -19,7 +19,7 @@ class DirectUpload if @resource_type.present? && @resource_relation.present? && (@attachment.present? || @cached_attachment.present?) @resource = @resource_type.constantize.find_or_initialize_by(id: @resource_id) - if @resource.respond_to?(:images) + if @resource.respond_to?(:images) && !@attachment.content_type.match(/pdf/) @relation = @resource.images.send("build", relation_attributtes) elsif @resource.class.reflections[@resource_relation].macro == :has_one @relation = @resource.send("build_#{resource_relation}", relation_attributtes) From c5c1ea7251b3cd7dacd78b3fc0aa1a17fedf029b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 6 Oct 2017 12:02:24 +0200 Subject: [PATCH 24/43] Fixed answer documents form --- app/controllers/admin/poll/questions/answers_controller.rb | 2 +- app/views/admin/poll/questions/answers/documents.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/poll/questions/answers_controller.rb b/app/controllers/admin/poll/questions/answers_controller.rb index e4d8869c0..2bc442fe5 100644 --- a/app/controllers/admin/poll/questions/answers_controller.rb +++ b/app/controllers/admin/poll/questions/answers_controller.rb @@ -20,7 +20,7 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController def update if @answer.update(answer_params) - redirect_to admin_question_path(@question), notice: t("flash.actions.save_changes.notice") + redirect_to admin_question_path(@answer.question), notice: t("flash.actions.save_changes.notice") else redirect_to :back end diff --git a/app/views/admin/poll/questions/answers/documents.html.erb b/app/views/admin/poll/questions/answers/documents.html.erb index ba2a6193b..54dd25a18 100644 --- a/app/views/admin/poll/questions/answers/documents.html.erb +++ b/app/views/admin/poll/questions/answers/documents.html.erb @@ -9,8 +9,8 @@
    <%= form_for(Poll::Question::Answer.new, - url: admin_answer_documents_path(@answer), - method: :post) do |f| %> + url: admin_answer_path(@answer), + method: :put) do |f| %> <%= render 'shared/errors', resource: @answer %> From bd1c03accf22de0a4b315a97f1319121b3db45ca Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 6 Oct 2017 12:15:45 +0200 Subject: [PATCH 25/43] fixes upload of answer's images --- .../admin/poll/questions/answers/images_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/poll/questions/answers/images_controller.rb b/app/controllers/admin/poll/questions/answers/images_controller.rb index 4074eb371..1bf30907d 100644 --- a/app/controllers/admin/poll/questions/answers/images_controller.rb +++ b/app/controllers/admin/poll/questions/answers/images_controller.rb @@ -23,7 +23,8 @@ class Admin::Poll::Questions::Answers::ImagesController < Admin::Poll::BaseContr private def images_params - params.permit(images_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) + params.require(:poll_question_answer).permit(:answer_id, + images_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) end def load_answer From 8e5cf50679b3fa4e819d4d3e857dc37a33e7f68a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 6 Oct 2017 12:52:13 +0200 Subject: [PATCH 26/43] Prevent user from seeing its votes in a poll after signing in --- app/helpers/polls_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/polls_helper.rb b/app/helpers/polls_helper.rb index a676084cb..c66db216f 100644 --- a/app/helpers/polls_helper.rb +++ b/app/helpers/polls_helper.rb @@ -42,7 +42,7 @@ module PollsHelper end def voted_before_sign_in(question) - current_user.current_sign_in_at >= question.poll.voters.find_by_user_id(current_user).updated_at + current_user.current_sign_in_at >= question.answers.find_or_initialize_by(author: current_user).updated_at end end From b4d494ce2487a2cf85f9861cfc0a52a7869fe1c0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 6 Oct 2017 12:57:21 +0200 Subject: [PATCH 27/43] fixes documents specs --- spec/shared/features/nested_documentable.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/shared/features/nested_documentable.rb b/spec/shared/features/nested_documentable.rb index 8780936a7..1ad9b55a9 100644 --- a/spec/shared/features/nested_documentable.rb +++ b/spec/shared/features/nested_documentable.rb @@ -193,7 +193,8 @@ shared_examples "nested documentable" do |login_as_name, documentable_factory_na click_on submit_button documentable_redirected_to_resource_show_or_navigate_to - expect(page).to have_content "Documents (1)" + expect(page).to have_content "Documents" + expect(page).to have_link "empty.pdf" end scenario "Should show resource with new document after successful creation with maximum allowed uploaded files", :js do From 089c1fecfd1187dc3b9e09de589bd567d85af6f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 6 Oct 2017 13:37:24 +0200 Subject: [PATCH 28/43] Added tests --- spec/features/polls/voter_spec.rb | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/spec/features/polls/voter_spec.rb b/spec/features/polls/voter_spec.rb index 453924674..e558b7261 100644 --- a/spec/features/polls/voter_spec.rb +++ b/spec/features/polls/voter_spec.rb @@ -91,9 +91,32 @@ feature "Voter" do visit poll_path(poll) expect(page).to_not have_link('Yes') - expect(page).to have_content "You have already participated in a booth for this poll." + expect(page).to have_content "You have already participated in a physical booth. You can not participate again." expect(Poll::Voter.count).to eq(1) end + + scenario "Trying to vote in web again", :js do + login_as user + vote_for_poll_via_web(poll, question) + + visit poll_path(poll) + + expect(page).to have_content "You have already participated in this poll. If you vote again it will be overwritten." + within("#poll_question_#{question.id}_answers") do + expect(page).to_not have_link('Yes') + end + + click_link "Sign out" + + login_as user + visit poll_path(poll) + + within("#poll_question_#{question.id}_answers") do + expect(page).to have_link('Yes') + expect(page).to have_link('No') + end + + end end end From 9a31c97a20e4b5f44d80819014996757b04bc03f Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 6 Oct 2017 14:01:03 +0200 Subject: [PATCH 29/43] fixes image specs --- app/models/direct_upload.rb | 4 +++- spec/shared/features/nested_imageable.rb | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/models/direct_upload.rb b/app/models/direct_upload.rb index cbd98f3d2..85d397706 100644 --- a/app/models/direct_upload.rb +++ b/app/models/direct_upload.rb @@ -19,7 +19,9 @@ class DirectUpload if @resource_type.present? && @resource_relation.present? && (@attachment.present? || @cached_attachment.present?) @resource = @resource_type.constantize.find_or_initialize_by(id: @resource_id) - if @resource.respond_to?(:images) && !@attachment.content_type.match(/pdf/) + #Refactor + if @resource.respond_to?(:images) && + (@attachment.present? && !@attachment.content_type.match(/pdf/)) || @cached_attachment.present? @relation = @resource.images.send("build", relation_attributtes) elsif @resource.class.reflections[@resource_relation].macro == :has_one @relation = @resource.send("build_#{resource_relation}", relation_attributtes) diff --git a/spec/shared/features/nested_imageable.rb b/spec/shared/features/nested_imageable.rb index bd519a5bb..1eef9a269 100644 --- a/spec/shared/features/nested_imageable.rb +++ b/spec/shared/features/nested_imageable.rb @@ -146,7 +146,11 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_p send(fill_resource_method_name) if fill_resource_method_name click_on submit_button - expect(page).to have_content imageable_success_notice + if has_many_images + skip "no need to test, there are no attributes for the parent resource" + else + expect(page).to have_content imageable_success_notice + end end scenario "Should show successful notice when resource filled correctly and after valid file uploads", :js do From 305b5dcf07ddfab603b81679d27fc03ac34d28e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 6 Oct 2017 14:45:44 +0200 Subject: [PATCH 30/43] Fixed test --- spec/features/polls/polls_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb index 22b90740a..c3211e1ab 100644 --- a/spec/features/polls/polls_spec.rb +++ b/spec/features/polls/polls_spec.rb @@ -209,8 +209,7 @@ feature 'Polls' do visit poll_path(poll) expect(page).to have_link('Han Solo') - expect(page).to_not have_link('Chewbacca') - expect(page).to have_content('Chewbacca') + expect(page).to have_link('Chewbacca') end scenario 'Level 2 users answering', :js do From 63eaa0bef6f32f2de26f4868f04fbfd7b8f2a7b3 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Fri, 6 Oct 2017 09:48:17 -0400 Subject: [PATCH 31/43] Allow Poll::Question::Answer edit As requested by #1992 --- .../poll/questions/answers_controller.rb | 22 +++++++- .../poll/questions/answers/_form.html.erb | 9 ++-- .../poll/questions/answers/edit.html.erb | 14 +++++ .../poll/questions/answers/show.html.erb | 32 ++++++++++++ app/views/admin/poll/questions/show.html.erb | 4 +- config/locales/en/activerecord.yml | 6 +-- config/locales/en/admin.yml | 9 +++- config/locales/es/activerecord.yml | 6 +-- config/locales/es/admin.yml | 9 +++- config/locales/fr/activerecord.yml | 6 +-- config/locales/fr/admin.yml | 9 +++- config/routes.rb | 2 +- .../poll/questions/answers/answers_spec.rb | 51 +++++++++++++++++++ 13 files changed, 157 insertions(+), 22 deletions(-) create mode 100644 app/views/admin/poll/questions/answers/edit.html.erb create mode 100644 app/views/admin/poll/questions/answers/show.html.erb create mode 100644 spec/features/admin/poll/questions/answers/answers_spec.rb diff --git a/app/controllers/admin/poll/questions/answers_controller.rb b/app/controllers/admin/poll/questions/answers_controller.rb index 660339844..4d70b34d1 100644 --- a/app/controllers/admin/poll/questions/answers_controller.rb +++ b/app/controllers/admin/poll/questions/answers_controller.rb @@ -1,5 +1,6 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController - before_action :load_question + before_action :load_question, except: [:show, :edit, :update] + before_action :load_answer, only: [:show, :edit, :update] load_and_authorize_resource :question, class: "::Poll::Question" @@ -18,6 +19,21 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController end end + def show + end + + def edit + end + + def update + if @answer.update(answer_params) + redirect_to admin_answer_path(@answer), + notice: t("flash.actions.save_changes.notice") + else + render :edit + end + end + private def answer_params @@ -27,4 +43,8 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController def load_question @question = ::Poll::Question.find(params[:question_id]) end + + def load_answer + @answer = ::Poll::Question::Answer.find(params[:id]) + end end diff --git a/app/views/admin/poll/questions/answers/_form.html.erb b/app/views/admin/poll/questions/answers/_form.html.erb index 72ffb4771..3eae62c2f 100644 --- a/app/views/admin/poll/questions/answers/_form.html.erb +++ b/app/views/admin/poll/questions/answers/_form.html.erb @@ -2,17 +2,14 @@ <%= render 'shared/errors', resource: @answer %> - <%= f.hidden_field :question_id, value: @question.id %> + <%= f.hidden_field :question_id, value: @answer.question_id || @question.id %> - <%= f.label :title, t('admin.questions.new.form.title') %> - <%= f.text_field :title, label: false %> + <%= f.text_field :title %>
    - <%= f.label :description, t('admin.questions.new.form.description') %> <%= f.cktext_area :description, maxlength: Poll::Question.description_max_length, - ckeditor: { language: I18n.locale }, - label: false %> + ckeditor: { language: I18n.locale } %>
    diff --git a/app/views/admin/poll/questions/answers/edit.html.erb b/app/views/admin/poll/questions/answers/edit.html.erb new file mode 100644 index 000000000..48fb4ad5d --- /dev/null +++ b/app/views/admin/poll/questions/answers/edit.html.erb @@ -0,0 +1,14 @@ +<%= back_link_to %> + +
      +
    • <%= @answer.title %>
      • +
    • <%= t('admin.answers.edit.title') %>
      • +
    + +

    + <%= t("admin.answers.edit.title") %> +

    + +
    + <%= render "form", form_url: admin_answer_path(@answer) %> +
    diff --git a/app/views/admin/poll/questions/answers/show.html.erb b/app/views/admin/poll/questions/answers/show.html.erb new file mode 100644 index 000000000..e6e0244a0 --- /dev/null +++ b/app/views/admin/poll/questions/answers/show.html.erb @@ -0,0 +1,32 @@ +<%= back_link_to %> + +<%= link_to t('shared.edit'), edit_admin_answer_path(@answer), + class: "button hollow float-right" %> + +
      +
    • <%= @answer.question.title %>
      • +
    • <%= @answer.title %>
      • +
    + +
    + +
    +
    +

    + <%= t("admin.answers.show.title") %> +
    + <%= @answer.title %> +

    + +

    + <%= t("admin.answers.show.description") %> + <%= @answer.description %> +

    + +

    + <%= t("admin.answers.show.images") %> +
    + <%= link_to t("admin.answers.show.images_list"), admin_answer_images_path(@answer) %> +

    +
    +
    diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb index 64c30de1e..fd405d62f 100644 --- a/app/views/admin/poll/questions/show.html.erb +++ b/app/views/admin/poll/questions/show.html.erb @@ -31,7 +31,7 @@
    <%= t("admin.questions.show.answers.document_title") %><%= t("admin.questions.show.answers.document_actions") %><%= t("admin.questions.show.answers.document_actions") %>
    + <%= link_to document.title, document.attachment.url %> + <%= link_to t('documents.buttons.download_document'), document.attachment.url, target: "_blank", From 3ce98b6cdf00038706b3949e5d3b5267e33c0ed5 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 6 Oct 2017 02:09:01 +0200 Subject: [PATCH 21/43] fixes answer documents path on polls questions show --- app/views/admin/poll/questions/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb index 0a89bf915..acb49b5e1 100644 --- a/app/views/admin/poll/questions/show.html.erb +++ b/app/views/admin/poll/questions/show.html.erb @@ -60,7 +60,7 @@ (<%= answer.documents.count rescue 0 %>)
    <%= link_to t("admin.questions.show.answers.documents_list"), - admin_question_answer_documents_path(@question, answer) %> + admin_answer_documents_path(answer) %>
    - - + <% @officer_assignments.each do |officer_assignment| %> - + <% end %> From cb1542874241e115f39af6bad5abf7095b29d8f5 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Fri, 6 Oct 2017 19:57:31 +0200 Subject: [PATCH 39/43] Add scenario for re-voting after sing out the same answer --- spec/features/polls/polls_spec.rb | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb index c3211e1ab..91b90c23f 100644 --- a/spec/features/polls/polls_spec.rb +++ b/spec/features/polls/polls_spec.rb @@ -255,5 +255,39 @@ feature 'Polls' do expect(page).to have_link('Han Solo') end + scenario 'Level 2 votes, signs out, signs in, votes again', :js do + poll.update(geozone_restricted: true) + poll.geozones << geozone + + question = create(:poll_question, poll: poll) + answer1 = create(:poll_question_answer, question: question, title: 'Han Solo') + answer2 = create(:poll_question_answer, question: question, title: 'Chewbacca') + + user = create(:user, :level_two, geozone: geozone) + + login_as user + visit poll_path(poll) + click_link 'Han Solo' + + expect(page).to_not have_link('Han Solo') + expect(page).to have_link('Chewbacca') + + click_link "Sign out" + login_as user + visit poll_path(poll) + click_link 'Han Solo' + + expect(page).to_not have_link('Han Solo') + expect(page).to have_link('Chewbacca') + + click_link "Sign out" + login_as user + visit poll_path(poll) + click_link 'Chewbacca' + + expect(page).to_not have_link('Chewbacca') + expect(page).to have_link('Han Solo') + end + end end From 81f65f1ac97517933bf32b0c116198d631dbd105 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Fri, 6 Oct 2017 19:57:52 +0200 Subject: [PATCH 40/43] Touch answer model to force the updated_at value update --- app/controllers/polls/questions_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/polls/questions_controller.rb b/app/controllers/polls/questions_controller.rb index 490b32fbe..7fecefe98 100644 --- a/app/controllers/polls/questions_controller.rb +++ b/app/controllers/polls/questions_controller.rb @@ -9,6 +9,7 @@ class Polls::QuestionsController < ApplicationController answer = @question.answers.find_or_initialize_by(author: current_user) answer.answer = params[:answer] + answer.touch if answer.persisted? answer.save! answer.record_voter_participation From bfef00d478e399160185044390a652aedc80c3fc Mon Sep 17 00:00:00 2001 From: Bertocq Date: Fri, 6 Oct 2017 20:07:57 +0200 Subject: [PATCH 41/43] Refactor voted_before_sign_in logic to avoid no-answer scenario error --- app/helpers/polls_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/polls_helper.rb b/app/helpers/polls_helper.rb index c66db216f..b6c0518bb 100644 --- a/app/helpers/polls_helper.rb +++ b/app/helpers/polls_helper.rb @@ -42,7 +42,7 @@ module PollsHelper end def voted_before_sign_in(question) - current_user.current_sign_in_at >= question.answers.find_or_initialize_by(author: current_user).updated_at + question.answers.where(author: current_user).any? { |vote| current_user.current_sign_in_at >= vote.updated_at } end end From cf3a62b12688b16da5c147d9be67423d4fbce4ae Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 6 Oct 2017 20:32:06 +0200 Subject: [PATCH 42/43] fixes specs --- app/controllers/admin/poll/questions/answers_controller.rb | 4 ++++ config/locales/en/admin.yml | 3 --- config/locales/es/admin.yml | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/poll/questions/answers_controller.rb b/app/controllers/admin/poll/questions/answers_controller.rb index 16867398e..45f0abcd7 100644 --- a/app/controllers/admin/poll/questions/answers_controller.rb +++ b/app/controllers/admin/poll/questions/answers_controller.rb @@ -50,4 +50,8 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController @answer = ::Poll::Question::Answer.find(params[:id] || params[:answer_id]) end + def load_question + @question = ::Poll::Question.find(params[:question_id]) + end + end diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 59fad34a3..b16214a2a 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -587,9 +587,6 @@ en: new: title: "Create Question" poll_label: "Poll" - form: - title: Title - description: Description answers: images: add_image: "Add image" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 00fc4c032..75fa73dff 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -587,9 +587,6 @@ es: new: title: "Crear pregunta ciudadana" poll_label: "Votación" - form: - title: Título - description: Descripción answers: images: add_image: "Añadir imagen" From 00bb6874dbe8df40873b393bb84d234b9af14404 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Fri, 6 Oct 2017 12:16:59 +0200 Subject: [PATCH 43/43] Fix dev seeds rake, creating Poll Question Answers --- db/dev_seeds.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 3ce1a439f..31902bad9 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -557,10 +557,14 @@ print "Creating Poll Questions" author = User.reorder("RANDOM()").first description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " open_at = rand(2.months.ago..2.months.from_now) + answers = Faker::Lorem.words((2..4).to_a.sample).map { |answer| answer.capitalize } question = Poll::Question.create!(author: author, title: Faker::Lorem.sentence(3).truncate(60), - valid_answers: Faker::Lorem.words((2..7).to_a.sample).join(', '), + valid_answers: answers.join(', '), poll: poll) + answers.each do |answer| + Poll::Question::Answer.create!(question: question, title: answer, description: Faker::ChuckNorris.fact) + end end puts " ✅"
    + <%= t('admin.questions.show.valid_answers') %> <%= link_to t("admin.questions.show.add_answer"), new_admin_question_answer_path(@question), @@ -47,7 +47,7 @@ <% @question.question_answers.each do |answer| %>
    <%= answer.title %><%= link_to answer.title, admin_answer_path(answer) %> <%= answer.description %> (<%= answer.images.count %>)
    diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 5ef1917d3..78435aa58 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -213,9 +213,9 @@ en: image: title: Title attachment: Attachment - poll/question_answer: - title: "Answer" - description: "Description" + poll/question/answer: + title: Answer + description: Description errors: models: user: diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 02d8bacdd..b2b6aca3a 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -609,7 +609,14 @@ en: images_list: Images list answers: new: - title: "New answer" + title: New answer + show: + title: Title + description: Description + images: Images + images_list: Images list + edit: + title: Edit answer recounts: index: title: "Recounts" diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 9b3260680..03bcdfc60 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -207,9 +207,9 @@ es: image: title: Título attachment: Archivo adjunto - poll/question_answer: - title: "Respuesta" - description: "Descripción" + poll/question/answer: + title: Respuesta + description: Descripción errors: models: user: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 9e0de770e..d2b405fe7 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -611,9 +611,16 @@ es: images_list: Lista de imágenes answers: new: - title: "Nueva respuesta" + title: Nueva respuesta video_url: Video externo documents: Documentos (1) + show: + title: Título + description: Descripción + images: Imágenes + images_list: Lista de imágenes + edit: + title: Editar respuesta recounts: index: title: "Recuentos" diff --git a/config/locales/fr/activerecord.yml b/config/locales/fr/activerecord.yml index d6ab5db80..59350d85d 100644 --- a/config/locales/fr/activerecord.yml +++ b/config/locales/fr/activerecord.yml @@ -147,9 +147,9 @@ fr: name: Nom locale: Langue body: Contenu - poll/question_answer: - title: "Réponse" - description: "Description" + poll/question/answer: + title: Réponse + description: Description errors: models: user: diff --git a/config/locales/fr/admin.yml b/config/locales/fr/admin.yml index e000c8a28..df288a934 100644 --- a/config/locales/fr/admin.yml +++ b/config/locales/fr/admin.yml @@ -387,8 +387,15 @@ fr: description: Description preview: Voir l'aperçu answers: + show: + title: Titre + description: Description + images: Images + images_list: Liste des images new: - title: "Nouvelle réponse" + title: Nouvelle réponse + edit: + title: Modifier réponse recounts: index: title: "Dépouillements" diff --git a/config/routes.rb b/config/routes.rb index 387983d4b..3a8f4b9cd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -301,7 +301,7 @@ Rails.application.routes.draw do end resources :questions do - resources :answers, only: [:new, :create], controller: 'questions/answers', shallow: true do + resources :answers, except: [:index, :destroy, :delete], controller: 'questions/answers', shallow: true do resources :images, controller: 'questions/answers/images' end diff --git a/spec/features/admin/poll/questions/answers/answers_spec.rb b/spec/features/admin/poll/questions/answers/answers_spec.rb new file mode 100644 index 000000000..b3b3ad420 --- /dev/null +++ b/spec/features/admin/poll/questions/answers/answers_spec.rb @@ -0,0 +1,51 @@ +require 'rails_helper' + +feature 'Answers' do + + background do + admin = create(:administrator) + login_as (admin.user) + end + + scenario 'Create' do + question = create(:poll_question) + title = 'Whatever the question may be, the answer is always 42' + description = "The Hitchhiker's Guide To The Universe" + + visit admin_question_path(question) + click_link 'Add answer' + + fill_in 'poll_question_answer_title', with: title + fill_in 'poll_question_answer_description', with: description + + click_button 'Save' + + expect(page).to have_content(title) + expect(page).to have_content(description) + end + + scenario 'Update' do + question = create(:poll_question) + answer = create(:poll_question_answer, question: question) + + visit admin_answer_path(answer) + + click_link 'Edit' + + old_title = answer.title + new_title = 'Ex Machina' + + fill_in 'poll_question_answer_title', with: new_title + + click_button 'Save' + + expect(page).to have_content('Changes saved') + expect(page).to have_content(new_title) + + visit admin_question_path(question) + + expect(page).to have_content(new_title) + expect(page).to_not have_content(old_title) + end + +end From 47ee8a2f79ca504be9df8e2b02349033378185a5 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 6 Oct 2017 16:19:55 +0200 Subject: [PATCH 32/43] shows answer title on polls show only if description is present --- app/views/polls/show.html.erb | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index b632fac55..914c39d85 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -60,25 +60,28 @@
    -
    +
    <% @poll.questions.map(&:question_answers).flatten.each do |answer| %>
    + data-toggler=".medium-6" data-equalizer-watch> -

    <%= answer.title %>

    + <% if answer.description.present? %> +

    <%= answer.title %>

    + <% end %> <% if answer.images.any? %> <%= render "gallery", answer: answer %> <% end %> -
    - <%= safe_html_with_links simple_format(answer.description) %> -
    + <% if answer.description.present? %> +
    + <%= safe_html_with_links simple_format(answer.description) %> +
    + <% end %>
    <% end %>
    -
    From 1933cf62faab0e057b439496fd2842aa9e3bbd31 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 6 Oct 2017 16:44:26 +0200 Subject: [PATCH 33/43] changes gallery order images --- app/views/polls/_gallery.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/polls/_gallery.html.erb b/app/views/polls/_gallery.html.erb index ba6cfc2e6..d71b6dcfe 100644 --- a/app/views/polls/_gallery.html.erb +++ b/app/views/polls/_gallery.html.erb @@ -16,7 +16,7 @@ - <% answer.images.each_with_index do |image, index| %> + <% answer.images.reverse.each_with_index do |image, index| %>
  • <%= link_to image.attachment.url(:original), target: "_blank" do %> <%= image_tag image.attachment.url(:medium), From 225ede4a42e5db1ea44703ae00132420182316c8 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 6 Oct 2017 16:58:49 +0200 Subject: [PATCH 34/43] hides temporally documents sidebar on polls show --- app/views/polls/show.html.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 914c39d85..b69073cb8 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -52,10 +52,12 @@ <%= safe_html_with_links simple_format(@poll.description) %> - + <% end %> From 23682fadd87910226136c5ce2cf55fa2ab2b0981 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 6 Oct 2017 17:50:41 +0200 Subject: [PATCH 35/43] fixes document specs --- app/models/direct_upload.rb | 2 +- spec/shared/features/nested_documentable.rb | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/models/direct_upload.rb b/app/models/direct_upload.rb index 85d397706..e597f9f12 100644 --- a/app/models/direct_upload.rb +++ b/app/models/direct_upload.rb @@ -21,7 +21,7 @@ class DirectUpload #Refactor if @resource.respond_to?(:images) && - (@attachment.present? && !@attachment.content_type.match(/pdf/)) || @cached_attachment.present? + ((@attachment.present? && !@attachment.content_type.match(/pdf/)) || @cached_attachment.present?) @relation = @resource.images.send("build", relation_attributtes) elsif @resource.class.reflections[@resource_relation].macro == :has_one @relation = @resource.send("build_#{resource_relation}", relation_attributtes) diff --git a/spec/shared/features/nested_documentable.rb b/spec/shared/features/nested_documentable.rb index 3e87c4021..24d6631a8 100644 --- a/spec/shared/features/nested_documentable.rb +++ b/spec/shared/features/nested_documentable.rb @@ -191,10 +191,17 @@ shared_examples "nested documentable" do |login_as_name, documentable_factory_na documentable_attach_new_file(documentable_factory_name, 0, "spec/fixtures/files/empty.pdf") click_on submit_button + documentable_redirected_to_resource_show_or_navigate_to expect(page).to have_content "Documents" - expect(page).to have_link "empty.pdf" + + find("#tab-documents-label").click + expect(page).to have_content "empty.pdf" + + #Review + #Doble check why the file is stored with a name different to empty.pdf + expect(page).to have_css("a[href$='.pdf']") end scenario "Should show resource with new document after successful creation with maximum allowed uploaded files", :js do From 5c2784794f7586bd8c2f8282a204b1da377afc6a Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 6 Oct 2017 18:04:15 +0200 Subject: [PATCH 36/43] changes medium to large size on gallery images --- app/views/polls/_gallery.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/polls/_gallery.html.erb b/app/views/polls/_gallery.html.erb index d71b6dcfe..d3da43b88 100644 --- a/app/views/polls/_gallery.html.erb +++ b/app/views/polls/_gallery.html.erb @@ -19,7 +19,7 @@ <% answer.images.reverse.each_with_index do |image, index| %>
  • <%= link_to image.attachment.url(:original), target: "_blank" do %> - <%= image_tag image.attachment.url(:medium), + <%= image_tag image.attachment.url(:large), class: "orbit-image", alt: image.title %> <% end %> From dcc5ebf5309c70e9734dfc13e0f1220c66752cca Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 6 Oct 2017 18:09:05 +0200 Subject: [PATCH 37/43] removes data equalizer to avoid big scrolls --- app/views/polls/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 5d02aa891..1eb128333 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -67,11 +67,11 @@
    -
    +
    <% @poll.questions.map(&:question_answers).flatten.each do |answer| %>
    + data-toggler=".medium-6"> <% if answer.description.present? %>

    <%= answer.title %>

    From 59175ff0394b9dae229a548e9227ea4b423ee95b Mon Sep 17 00:00:00 2001 From: Bertocq Date: Fri, 6 Oct 2017 18:36:19 +0200 Subject: [PATCH 38/43] Add date on officer assignment list for final shifts --- app/views/admin/poll/officer_assignments/by_officer.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/poll/officer_assignments/by_officer.html.erb b/app/views/admin/poll/officer_assignments/by_officer.html.erb index c9873db96..c6738eba0 100644 --- a/app/views/admin/poll/officer_assignments/by_officer.html.erb +++ b/app/views/admin/poll/officer_assignments/by_officer.html.erb @@ -21,7 +21,7 @@
    • <%= officer_assignment.final? ? t('polls.final_date') : l(officer_assignment.date.to_date) %><%= l(officer_assignment.date.to_date)%> <%= content_tag :strong, t('polls.final_date') if officer_assignment.final %> <%= booth_name_with_location(officer_assignment.booth_assignment.booth) %>