From ae965bbb6acb287fc8f8fceed5d5c4a3b0f4552d Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 15 Sep 2021 23:57:44 +0800 Subject: [PATCH] fix error --- app/models/site_feed_annc.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/models/site_feed_annc.rb b/app/models/site_feed_annc.rb index 00c7e73..0c62abe 100644 --- a/app/models/site_feed_annc.rb +++ b/app/models/site_feed_annc.rb @@ -60,10 +60,14 @@ class SiteFeedAnnc tmp["subtitle"] = tmp["subtitle_translations"][locale] tmp["source-site-link"] = tmp["source-site"] tmp["source-site"] = "#{tmp["source-site-title"]}" - if !is_widget - tmp["link_to_show"] = OrbitHelper.url_to_show(tmp["params"]) rescue '' + if !tmp["external_link"].blank? + tmp["link_to_show"] = tmp["external_link"] else - tmp["link_to_show"] = OrbitHelper.widget_item_url(tmp["params"]) rescue '' + if !is_widget + tmp["link_to_show"] = OrbitHelper.url_to_show(tmp["params"]) rescue '' + else + tmp["link_to_show"] = OrbitHelper.widget_item_url(tmp["params"]) rescue '' + end end tmp["target"] = "_self" tmp["img_src"] = tmp["image"]["thumb"] || "/assets/announcement-default.jpg"