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 01/17] 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 02/17] 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? %> + + + + + + + <% @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 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 03/17] 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 04/17] 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 05/17] 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 06/17] 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 07/17] 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 08/17] 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 10/17] 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 11/17] 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 12/17] 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 13/17] 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 b4d494ce2487a2cf85f9861cfc0a52a7869fe1c0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 6 Oct 2017 12:57:21 +0200 Subject: [PATCH 14/17] 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 9a31c97a20e4b5f44d80819014996757b04bc03f Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 6 Oct 2017 14:01:03 +0200 Subject: [PATCH 15/17] 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 23682fadd87910226136c5ce2cf55fa2ab2b0981 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Fri, 6 Oct 2017 17:50:41 +0200 Subject: [PATCH 16/17] 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 59175ff0394b9dae229a548e9227ea4b423ee95b Mon Sep 17 00:00:00 2001 From: Bertocq Date: Fri, 6 Oct 2017 18:36:19 +0200 Subject: [PATCH 17/17] 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_assignments.each do |officer_assignment| %> - + <% end %>
    <%= 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 09/17] 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_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) %>