From cb926ac78ff72b73e43a4e4865c07a355a054328 Mon Sep 17 00:00:00 2001 From: rulingcom Date: Thu, 10 Sep 2026 15:32:07 +0800 Subject: [PATCH] Add reminder --- app/controllers/admin/announcements_controller.rb | 7 ++++++- app/views/admin/announcements/_form.html.erb | 4 ++++ config/locales/en.yml | 3 ++- config/locales/zh_tw.yml | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb index b604c8f..91acf2e 100644 --- a/app/controllers/admin/announcements_controller.rb +++ b/app/controllers/admin/announcements_controller.rb @@ -617,7 +617,12 @@ class Admin::AnnouncementsController < OrbitAdminController bulletin.is_preview = true bulletin.save #BulletinFeed.create_feed_cache(bulletin) - render :plain=>page_for_bulletin(bulletin) + "?preview=true" + preview_url = page_for_bulletin(bulletin) + if preview_url == "#" + render :json => { "error" => true, "message" => t("announcement.no_announcement_page") } + else + render :plain=>preview_url + "?preview=true" + end end def get_preview_action bulletin = Bulletin.find_by(:uid=>params['uid']) diff --git a/app/views/admin/announcements/_form.html.erb b/app/views/admin/announcements/_form.html.erb index 72b5be5..8bad498 100644 --- a/app/views/admin/announcements/_form.html.erb +++ b/app/views/admin/announcements/_form.html.erb @@ -894,6 +894,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 6d9f092..fe589a7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,6 +3,7 @@ en: feed: Feed import: Import announcement: + no_announcement_page: "No announcement page has been set. Please set one first." read_from_cache: "Read from cache!" delete_selected: "Delete Selected" expired: This announcement has been expired. @@ -207,4 +208,4 @@ en: '11': 'November' '12': 'December' calendar_title: "%{month} %{year}" - \ No newline at end of file + diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 6548f24..f271ad8 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -4,6 +4,7 @@ zh_tw: import: 匯入 get_all_anncs_without_subannc: "選擇相關公告" announcement: + no_announcement_page: "沒有任何公告頁面,請先設定一個" read_from_cache: "從暫存中讀取!" delete_selected: "刪除所選" expired: 此則公告已過期 @@ -196,4 +197,4 @@ zh_tw: top: 置頂 hot: 熱門 hidden: 隱藏 - calendar_title: "%{year}年%{month}月" \ No newline at end of file + calendar_title: "%{year}年%{month}月"