From 188793747b8fc7cfe4ebb98c86b4142609b39a16 Mon Sep 17 00:00:00 2001
From: "BOYA,CHIU" <naruto0426@rulingcom.com>
Date: Thu, 12 Aug 2021 11:25:48 +0800
Subject: [PATCH] fix error

---
 app/controllers/web_resources_controller.rb   | 44 +++++++++++--------
 .../web_resource/_web_res_widget1.html.erb    |  2 +-
 .../web_resource/_web_res_widget2.html.erb    |  2 +-
 modules/web_resource/web_res_index1.html.erb  |  2 +-
 modules/web_resource/web_res_index2.html.erb  |  2 +-
 5 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/app/controllers/web_resources_controller.rb b/app/controllers/web_resources_controller.rb
index c7fd44a..3aa0da8 100644
--- a/app/controllers/web_resources_controller.rb
+++ b/app/controllers/web_resources_controller.rb
@@ -22,11 +22,13 @@ class WebResourcesController < ApplicationController
     end
     desc = link.image_description
     desc = (desc.blank? ? "web resource image" : desc)
+    display_image = link.image.thumb.url.blank? 'style="display: none;"' : ''
     {
       "title" => link.title,
       "title_text" => text,
       "img_src" => link.image.thumb.url || "/assets/announcement-default.jpg",
       "img_description" => desc,
+      "display_image" => display_image,
       "context" => nl2br(link.context.to_s),
       "statuses" => statuses,
       "category" => link.category.title,
@@ -52,24 +54,30 @@ class WebResourcesController < ApplicationController
           "status-class" => "status-#{status['classname']}"
         }
       end
-    if link.link_open == "new_window"
-      target = "_blank"
-    elsif link.link_open == "local"
-      target = "_self"
-    end
-    doc = Nokogiri::HTML(link.title.to_s)
-    text = doc.css("body")[0].text rescue ""
-    if text.blank? && doc.css("img").count != 0
-      text = doc.css("img").map{|img| img.attr("alt") rescue ""}.select{|t| t.present?}.first
-    end
-    {
-      "title" => link.title,
-      "title_text" => text,
-      "context" => nl2br(link.context.to_s),
-      "statuses" => statuses,
-      "link_to_show" => link.url,
-      "target" => target
-    }
+      if link.link_open == "new_window"
+        target = "_blank"
+      elsif link.link_open == "local"
+        target = "_self"
+      end
+      doc = Nokogiri::HTML(link.title.to_s)
+      text = doc.css("body")[0].text rescue ""
+      if text.blank? && doc.css("img").count != 0
+        text = doc.css("img").map{|img| img.attr("alt") rescue ""}.select{|t| t.present?}.first
+      end
+      desc = link.image_description
+      desc = (desc.blank? ? "web resource image" : desc)
+      display_image = link.image.thumb.url.blank? 'style="display: none;"' : ''
+      {
+        "title" => link.title,
+        "title_text" => text,
+        "img_src" => link.image.thumb.url || "/assets/announcement-default.jpg",
+        "img_description" => desc,
+        "display_image" => display_image,
+        "context" => nl2br(link.context.to_s),
+        "statuses" => statuses,
+        "link_to_show" => link.url,
+        "target" => target
+      }
     end
     {
       "web_link" => web_link,
diff --git a/modules/web_resource/_web_res_widget1.html.erb b/modules/web_resource/_web_res_widget1.html.erb
index 89c6815..dad8a43 100644
--- a/modules/web_resource/_web_res_widget1.html.erb
+++ b/modules/web_resource/_web_res_widget1.html.erb
@@ -4,7 +4,7 @@
   </h3>
   <ul class="list-unstyled" data-level="0" data-list="web_link">
     <li class="widget-content">
-      <div class="link-img-wrap">
+      <div class="link-img-wrap" {{display_image}}>
         <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
       </div>
       <a class="widget-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">{{title}}</a>
diff --git a/modules/web_resource/_web_res_widget2.html.erb b/modules/web_resource/_web_res_widget2.html.erb
index 7d70ee1..d2e57e1 100644
--- a/modules/web_resource/_web_res_widget2.html.erb
+++ b/modules/web_resource/_web_res_widget2.html.erb
@@ -4,7 +4,7 @@
   </h3>
   <ul class="list-unstyled" data-level="0" data-list="web_link">
     <li class="widget-content widget-content-horizontal">
-      <div class="link-img-wrap">
+      <div class="link-img-wrap" {{display_image}}>
         <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
       </div>
       <a class="widget-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">{{title}}</a>
diff --git a/modules/web_resource/web_res_index1.html.erb b/modules/web_resource/web_res_index1.html.erb
index 7d2f77b..1b012a2 100644
--- a/modules/web_resource/web_res_index1.html.erb
+++ b/modules/web_resource/web_res_index1.html.erb
@@ -5,7 +5,7 @@
   <ul class="list-unstyled" data-list="web_link" data-level="0">
     <li class="index-content">
       <a class="index-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">
-        <div class="link-img-wrap">
+        <div class="link-img-wrap" {{display_image}}>
           <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
         </div>
         <h4>
diff --git a/modules/web_resource/web_res_index2.html.erb b/modules/web_resource/web_res_index2.html.erb
index a7b2a9c..2caecf8 100644
--- a/modules/web_resource/web_res_index2.html.erb
+++ b/modules/web_resource/web_res_index2.html.erb
@@ -5,7 +5,7 @@
   <ul class="list-unstyled" data-list="web_link" data-level="0">
     <li class="index-content col-md-4 col-sm-4">
       <a class="index-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">
-        <div class="link-img-wrap">
+        <div class="link-img-wrap" {{display_image}}>
           <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
         </div>
         <h4>