Fix render :text no longer working, and show a reminder message when no page is found
This commit is contained in:
parent
3cd649e59b
commit
ffe9d494a5
|
|
@ -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?}
|
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 = iframe_params.except(:member_ids)
|
||||||
url_params['uids'] = uids if uids != []
|
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
|
end
|
||||||
def settings
|
def settings
|
||||||
@setting = @event_news_setting
|
@setting = @event_news_setting
|
||||||
|
|
@ -488,7 +488,12 @@ class Admin::EventNewsController < OrbitAdminController
|
||||||
|
|
||||||
event_news.is_preview = true
|
event_news.is_preview = true
|
||||||
event_news.save
|
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
|
end
|
||||||
|
|
||||||
def destroy_preview
|
def destroy_preview
|
||||||
|
|
|
||||||
|
|
@ -712,6 +712,10 @@
|
||||||
processData: false,
|
processData: false,
|
||||||
contentType: false
|
contentType: false
|
||||||
}).done(function(data){
|
}).done(function(data){
|
||||||
|
if(typeof data === "object" && data.error){
|
||||||
|
alert(data.message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
if(window.location.protocol === "https:"){
|
if(window.location.protocol === "https:"){
|
||||||
data = data.replace("http:","https:");
|
data = data.replace("http:","https:");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ en:
|
||||||
event_news_mod:
|
event_news_mod:
|
||||||
event_news_mod: Event News
|
event_news_mod: Event News
|
||||||
event_news:
|
event_news:
|
||||||
|
no_event_news_page: "No event news page has been set. Please set one first."
|
||||||
carousel_image_types:
|
carousel_image_types:
|
||||||
default: Default
|
default: Default
|
||||||
carousel: Carousel
|
carousel: Carousel
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ zh_tw:
|
||||||
event_news_mod:
|
event_news_mod:
|
||||||
event_news_mod: 活動公告
|
event_news_mod: 活動公告
|
||||||
event_news:
|
event_news:
|
||||||
|
no_event_news_page: "沒有任何活動公告頁面,請先設定一個"
|
||||||
carousel_image_types:
|
carousel_image_types:
|
||||||
default: 預設
|
default: 預設
|
||||||
carousel: 輪播
|
carousel: 輪播
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue