diff --git a/app/controllers/admin/event_news_controller.rb b/app/controllers/admin/event_news_controller.rb index 47e188a..dcd2cfb 100644 --- a/app/controllers/admin/event_news_controller.rb +++ b/app/controllers/admin/event_news_controller.rb @@ -84,7 +84,7 @@ class Admin::EventNewsController < OrbitAdminController uids = iframe_params['member_ids'].to_a.map{|m_id| MemberProfile.find(m_id).uid rescue nil}.select{|uid| !uid.nil?} url_params = iframe_params.except(:member_ids) url_params['uids'] = uids if uids != [] - render :text => '/xhr/panel/event_news/widget/sync_data?'+url_params.to_param + render :plain => '/xhr/panel/event_news/widget/sync_data?'+url_params.to_param end def settings @setting = @event_news_setting @@ -488,7 +488,12 @@ class Admin::EventNewsController < OrbitAdminController event_news.is_preview = true event_news.save - render :text=>page_for_event_news(event_news) + "?preview=true" + preview_url = page_for_event_news(event_news) + if preview_url == "/" + render :json => { "error" => true, "message" => t("event_news.no_event_news_page") } + else + render :plain=>preview_url + "?preview=true" + end end def destroy_preview diff --git a/app/views/admin/event_news/_form.html.erb b/app/views/admin/event_news/_form.html.erb index 3e6c13f..ed24a38 100644 --- a/app/views/admin/event_news/_form.html.erb +++ b/app/views/admin/event_news/_form.html.erb @@ -712,6 +712,10 @@ processData: false, contentType: false }).done(function(data){ + if(typeof data === "object" && data.error){ + alert(data.message); + return; + } if(window.location.protocol === "https:"){ data = data.replace("http:","https:"); } diff --git a/config/locales/en.yml b/config/locales/en.yml index d7f1cf7..0cd25e0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4,6 +4,7 @@ en: event_news_mod: event_news_mod: Event News event_news: + no_event_news_page: "No event news page has been set. Please set one first." carousel_image_types: default: Default carousel: Carousel diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 50db5b6..fa4de48 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -4,6 +4,7 @@ zh_tw: event_news_mod: event_news_mod: 活動公告 event_news: + no_event_news_page: "沒有任何活動公告頁面,請先設定一個" carousel_image_types: default: 預設 carousel: 輪播