chiu
/
event_news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error

This commit is contained in:
BOYA,CHIU 2021-08-24 23:43:30 +08:00
parent 034339bcc2
commit 5f4fe041b2
2 changed files with 57 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/event_news_controller.rb
View File

@ -562,6 +562,7 @@ class EventNewsController < ApplicationController
"event_news_files" => files, "event_news_files" => files,
"event_news_links" => links, "event_news_links" => links,
"event_carousel_images" => event_carousel_images, "event_carousel_images" => event_carousel_images,
"data" => {
"speaker-head" => EventNewsCustomTitle.get_trans('speaker'), "speaker-head" => EventNewsCustomTitle.get_trans('speaker'),
"host-head" => EventNewsCustomTitle.get_trans('host'), "host-head" => EventNewsCustomTitle.get_trans('host'),
"notes-head" => t('event_news.notes'), "notes-head" => t('event_news.notes'),
@ -586,7 +587,8 @@ class EventNewsController < ApplicationController
"next_btn_title" => next_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_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{event_news.carousel_image_width};margin: auto;"),
"carousel_count" => event_carousel_images.count, "carousel_count" => event_carousel_images.count,
"place_text" => (event_news.place.present? rescue false) ? "#{EventNewsCustomTitle.get_trans("place")}: #{event_news.place}" : "", "place_text" => (event_news.place.present? rescue false) ? "#{EventNewsCustomTitle.get_trans("place")}: #{event_news.place}" : ""
},
"impressionist" => (event_news.is_preview ? nil : event_news), "impressionist" => (event_news.is_preview ? nil : event_news),
"url_to_edit"=>url_to_edit "url_to_edit"=>url_to_edit
} }
@ -656,6 +658,7 @@ class EventNewsController < ApplicationController
"event_news_files" => files, "event_news_files" => files,
"event_news_links" => links, "event_news_links" => links,
"event_carousel_images" => event_carousel_images, "event_carousel_images" => event_carousel_images,
"data" => {
"title" => event_news["title_translations"][locale], "title" => event_news["title_translations"][locale],
"subtitle_ann" => subtitle_ann, "subtitle_ann" => subtitle_ann,
"update_user" => update_user, "update_user" => update_user,
@ -681,7 +684,8 @@ class EventNewsController < ApplicationController
"next_btn_title" => next_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_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{EventNewsSetting.last.carousel_image_width};margin: auto;"),
"carousel_count" => event_carousel_images.count, "carousel_count" => event_carousel_images.count,
"place_text" => (event_news["place"].present? rescue false) ? "#{I18n.t("event_news.place")}: #{event_news["place"]}" : "", "place_text" => (event_news["place"].present? rescue false) ? "#{I18n.t("event_news.place")}: #{event_news["place"]}" : ""
},
"impressionist" => nil, "impressionist" => nil,
"url_to_edit" => url_to_edit "url_to_edit" => url_to_edit
} }

2
app/helpers/event_news_helper.rb
View File

@ -56,6 +56,8 @@ module EventNewsHelper
"event_news_links" => links, "event_news_links" => links,
"event_news_files" => files, "event_news_files" => files,
"title" => a.title, "title" => a.title,
"speaker-css" => (a.speaker.blank? ? "display: none;" : ""),
"host-css" => (a.host.blank? ? "display: none;" : ""),
"speaker" => a.speaker, "speaker" => a.speaker,
"place" => a.place, "place" => a.place,
"host" => a.host, "host" => a.host,