From 3b824b02a3391ccecf71c3470d328fde3b5da945 Mon Sep 17 00:00:00 2001
From: Bohung <bohung@rulingcom.com>
Date: Wed, 7 Jul 2021 12:48:39 +0800
Subject: [PATCH] Fix bug.

---
 app/helpers/admin/announcements_helper.rb    | 8 ++++----
 modules/announcement/_annc_widget15.html.erb | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/helpers/admin/announcements_helper.rb b/app/helpers/admin/announcements_helper.rb
index 8c01d52..bba3288 100644
--- a/app/helpers/admin/announcements_helper.rb
+++ b/app/helpers/admin/announcements_helper.rb
@@ -5,11 +5,11 @@ require 'json'
 module Admin::AnnouncementsHelper
   def page_for_bulletin(bulletin)
     ann_page = nil
-    pages = Page.where(:module=>'announcement')
+    pages = Page.where(:module=>'announcement').select{|page| page.enabled_for.include?(I18n.locale.to_s)}
 
     pages.each do |page|
       if page.categories.count ==1
-        if page.categories.include?(bulletin.category.id.to_s)
+        if (page.categories.include?(bulletin.category.id.to_s) rescue false)
           ann_page = page
         end
       end
@@ -18,7 +18,7 @@ module Admin::AnnouncementsHelper
 
     if ann_page.nil?
        pages.each do |page|
-        if page.categories.include?(bulletin.category.id.to_s)
+        if (page.categories.include?(bulletin.category.id.to_s) rescue false)
           ann_page = page
         end
         break if !ann_page.nil?
@@ -26,7 +26,7 @@ module Admin::AnnouncementsHelper
     end
 
     ann_page = pages.first if ann_page.nil?
-    request.protocol+(request.host_with_port+ann_page.url+'/'+bulletin.to_param).gsub('//','/') rescue "/"
+    request.protocol+(request.host_with_port+ann_page.url+'/'+bulletin.to_param).gsub('//','/') rescue "#"
   end
 
   def import_this_announcement(row,categories,tags)
diff --git a/modules/announcement/_annc_widget15.html.erb b/modules/announcement/_annc_widget15.html.erb
index ee19b04..371f236 100644
--- a/modules/announcement/_annc_widget15.html.erb
+++ b/modules/announcement/_annc_widget15.html.erb
@@ -136,7 +136,7 @@
 			active_item.addClass("active");
 			active_item.find("li").css("display","block");
 			flag=true;
-			$('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list.active').eq(0).effect("slide", { direction: "right", mode: 'show', duration: 500},function(){flag=false;});
+			$('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list.active').eq(0).effect("slide", { direction: "left", mode: 'show', duration: 500},function(){flag=false;});
 		};
 	});
 	$('.btn-right').click(function(){
@@ -155,7 +155,7 @@
 			active_item.addClass("active");
 			active_item.find("li").css("display","block");
 			flag=true;
-			$('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list.active').eq(0).effect("slide", { direction: "left", mode: 'show', duration: 500},function(){flag=false;});
+			$('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list.active').eq(0).effect("slide", { direction: "right", mode: 'show', duration: 500},function(){flag=false;});
 		};
 	});
 	});