From fd8e2c15034d3fe6bdfb1d9b7b60afb4af764256 Mon Sep 17 00:00:00 2001 From: taitus Date: Sat, 22 Jul 2017 15:39:47 +0200 Subject: [PATCH] Allow to display images on carousel partial. --- app/helpers/welcome_helper.rb | 9 +++++++++ .../welcome/_recommended_carousel.html.erb | 1 + .../welcome/_recommended_no_image.html.erb | 20 ++++++++++++++++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index e17cbc00c..c4ff759fb 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -21,4 +21,13 @@ module WelcomeHelper end end + def render_image(recommended, image_field, image_version, image_default) + image_path = if image_field.present? && image_version.present? + recommended.send("#{image_field}", image_version) + elsif image_default.present? + image_default + end + image_tag(image_path) if image_path.present? + end + end diff --git a/app/views/welcome/_recommended_carousel.html.erb b/app/views/welcome/_recommended_carousel.html.erb index e552ea01e..2b1f891d3 100644 --- a/app/views/welcome/_recommended_carousel.html.erb +++ b/app/views/welcome/_recommended_carousel.html.erb @@ -9,6 +9,7 @@ <% recommendeds.each_with_index do |recommended, index| %>
  • + <%= render_image(recommended, image_field, image_version, image_default) %>
    <%= link_to recommended_path(recommended) do %>
    <%= recommended.title %>
    diff --git a/app/views/welcome/_recommended_no_image.html.erb b/app/views/welcome/_recommended_no_image.html.erb index ba693fffd..08894fddf 100644 --- a/app/views/welcome/_recommended_no_image.html.erb +++ b/app/views/welcome/_recommended_no_image.html.erb @@ -3,9 +3,23 @@

    <%= t("welcome.recommended.title") %>

    - <%= render "recommended_carousel", recommendeds: recommended_debates, key: "debates" %> - <%= render "recommended_carousel", recommendeds: recommended_proposals, key: "proposals" %> - <%= render "recommended_carousel", recommendeds: recommended_budget_investments, key: "budget-investments" %> + <%= render "recommended_carousel", recommendeds: recommended_debates, + key: "debates", + image_field: nil, + image_version: nil, + image_default: "https://dummyimage.com/600x400/000/fff" %> + + <%= render "recommended_carousel", recommendeds: recommended_proposals, + key: "proposals", + image_field: nil, + image_version: nil, + image_default: "https://dummyimage.com/600x400/000/fff" %> + + <%= render "recommended_carousel", recommendeds: recommended_budget_investments, + key: "budget-investments", + image_field: nil, #example value :image (PR#1691) + image_version: nil, #example value :thumb (PR#1691) + image_default: "https://dummyimage.com/600x400/000/fff" %>