From 5f4fe041b28e5dd9f6718e272552bfe15b2fbf68 Mon Sep 17 00:00:00 2001 From: "BOYA,CHIU" Date: Tue, 24 Aug 2021 23:43:30 +0800 Subject: [PATCH] fix error --- app/controllers/event_news_controller.rb | 106 ++++++++++++----------- app/helpers/event_news_helper.rb | 2 + 2 files changed, 57 insertions(+), 51 deletions(-) diff --git a/app/controllers/event_news_controller.rb b/app/controllers/event_news_controller.rb index 1654898..79e4623 100644 --- a/app/controllers/event_news_controller.rb +++ b/app/controllers/event_news_controller.rb @@ -562,31 +562,33 @@ class EventNewsController < ApplicationController "event_news_files" => files, "event_news_links" => links, "event_carousel_images" => event_carousel_images, - "speaker-head" => EventNewsCustomTitle.get_trans('speaker'), - "host-head" => EventNewsCustomTitle.get_trans('host'), - "notes-head" => t('event_news.notes'), - "speaker-css" => (event_news.speaker.blank? ? "display: none;" : ""), - "host-css" => (event_news.host.blank? ? "display: none;" : ""), - "speaker" => event_news.speaker, - "host" => event_news.host, - "notes" => event_news.notes, - "title" => event_news.title, - "subtitle_ann" => subtitle_ann, - "update_user" => update_user, - "updated_at" => event_time, - "body" =>event_news.text, - "image" => event_news.image.url, - "img_src" => img_src, - "img_description" => img_description, - "hide_class" => event_news.display_img? ? event_news.image_display_class : ' hide', - "alt_title" => desc, - "resume_btn_title" => resume_btn_title, - "pause_btn_title" => pause_btn_title, - "prev_btn_title" => prev_btn_title, - "next_btn_title" => next_btn_title, - "carousel_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{event_news.carousel_image_width};margin: auto;"), - "carousel_count" => event_carousel_images.count, - "place_text" => (event_news.place.present? rescue false) ? "#{EventNewsCustomTitle.get_trans("place")}: #{event_news.place}" : "", + "data" => { + "speaker-head" => EventNewsCustomTitle.get_trans('speaker'), + "host-head" => EventNewsCustomTitle.get_trans('host'), + "notes-head" => t('event_news.notes'), + "speaker-css" => (event_news.speaker.blank? ? "display: none;" : ""), + "host-css" => (event_news.host.blank? ? "display: none;" : ""), + "speaker" => event_news.speaker, + "host" => event_news.host, + "notes" => event_news.notes, + "title" => event_news.title, + "subtitle_ann" => subtitle_ann, + "update_user" => update_user, + "updated_at" => event_time, + "body" =>event_news.text, + "image" => event_news.image.url, + "img_src" => img_src, + "img_description" => img_description, + "hide_class" => event_news.display_img? ? event_news.image_display_class : ' hide', + "alt_title" => desc, + "resume_btn_title" => resume_btn_title, + "pause_btn_title" => pause_btn_title, + "prev_btn_title" => prev_btn_title, + "next_btn_title" => next_btn_title, + "carousel_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{event_news.carousel_image_width};margin: auto;"), + "carousel_count" => event_carousel_images.count, + "place_text" => (event_news.place.present? rescue false) ? "#{EventNewsCustomTitle.get_trans("place")}: #{event_news.place}" : "" + }, "impressionist" => (event_news.is_preview ? nil : event_news), "url_to_edit"=>url_to_edit } @@ -656,32 +658,34 @@ class EventNewsController < ApplicationController "event_news_files" => files, "event_news_links" => links, "event_carousel_images" => event_carousel_images, - "title" => event_news["title_translations"][locale], - "subtitle_ann" => subtitle_ann, - "update_user" => update_user, - "updated_at" => event_time, - "body" => event_news["text_translations"][locale], - "speaker-head" => EventNewsCustomTitle.get_trans('speaker'), - "host-head" => EventNewsCustomTitle.get_trans('host'), - "notes-head" => t('event_news.notes'), - "event_date-head" => EventNewsCustomTitle.get_trans('event_date'), - "speaker-css" => (speaker.blank? ? "display: none;" : ""), - "host-css" => (host.blank? ? "display: none;" : ""), - "speaker" => speaker, - "host" => host, - "notes" => (event_news["notes_translations"][locale].to_s rescue ""), - "image" => event_news["image"]["original"], - "img_src" => img_src, - "img_description" => img_description, - "hide_class" => event_news["display_img"] ? '' : ' hide', - "alt_title" => desc, - "resume_btn_title" => resume_btn_title, - "pause_btn_title" => pause_btn_title, - "prev_btn_title" => prev_btn_title, - "next_btn_title" => next_btn_title, - "carousel_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{EventNewsSetting.last.carousel_image_width};margin: auto;"), - "carousel_count" => event_carousel_images.count, - "place_text" => (event_news["place"].present? rescue false) ? "#{I18n.t("event_news.place")}: #{event_news["place"]}" : "", + "data" => { + "title" => event_news["title_translations"][locale], + "subtitle_ann" => subtitle_ann, + "update_user" => update_user, + "updated_at" => event_time, + "body" => event_news["text_translations"][locale], + "speaker-head" => EventNewsCustomTitle.get_trans('speaker'), + "host-head" => EventNewsCustomTitle.get_trans('host'), + "notes-head" => t('event_news.notes'), + "event_date-head" => EventNewsCustomTitle.get_trans('event_date'), + "speaker-css" => (speaker.blank? ? "display: none;" : ""), + "host-css" => (host.blank? ? "display: none;" : ""), + "speaker" => speaker, + "host" => host, + "notes" => (event_news["notes_translations"][locale].to_s rescue ""), + "image" => event_news["image"]["original"], + "img_src" => img_src, + "img_description" => img_description, + "hide_class" => event_news["display_img"] ? '' : ' hide', + "alt_title" => desc, + "resume_btn_title" => resume_btn_title, + "pause_btn_title" => pause_btn_title, + "prev_btn_title" => prev_btn_title, + "next_btn_title" => next_btn_title, + "carousel_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{EventNewsSetting.last.carousel_image_width};margin: auto;"), + "carousel_count" => event_carousel_images.count, + "place_text" => (event_news["place"].present? rescue false) ? "#{I18n.t("event_news.place")}: #{event_news["place"]}" : "" + }, "impressionist" => nil, "url_to_edit" => url_to_edit } diff --git a/app/helpers/event_news_helper.rb b/app/helpers/event_news_helper.rb index 82c84d0..6b80597 100644 --- a/app/helpers/event_news_helper.rb +++ b/app/helpers/event_news_helper.rb @@ -56,6 +56,8 @@ module EventNewsHelper "event_news_links" => links, "event_news_files" => files, "title" => a.title, + "speaker-css" => (a.speaker.blank? ? "display: none;" : ""), + "host-css" => (a.host.blank? ? "display: none;" : ""), "speaker" => a.speaker, "place" => a.place, "host" => a.host,