From 218dd21255898a62d20a45c19090d38f488b9337 Mon Sep 17 00:00:00 2001
From: Bohung <bohung@rulingcom.com>
Date: Tue, 19 Apr 2022 17:46:07 +0800
Subject: [PATCH] Fix bug.

---
 app/controllers/announcements_controller.rb | 12 ++++++++++++
 app/helpers/announcements_helper.rb         |  6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
index bb546af..a3d513e 100644
--- a/app/controllers/announcements_controller.rb
+++ b/app/controllers/announcements_controller.rb
@@ -219,6 +219,11 @@ class AnnouncementsController < ApplicationController
     get_tabs_option
     anns = []
     use_tag = false
+    @annc_depts = []
+    @tmp_enable_annc_dept = (enable_annc_dept rescue false)
+    if @tmp_enable_annc_dept
+      @annc_depts = annc_depts_translations[locale] rescue []
+    end
     if @tab_option == 0
       anns = get_anncs_for_pack_data(cats,tags,nil,is_random)
     else
@@ -537,6 +542,13 @@ class AnnouncementsController < ApplicationController
     end
   end
   def get_anncs_for_pack_data(cats,tags,set_tags=nil,is_random = false)
+    if @annc_depts.nil?
+      @annc_depts = []
+      @tmp_enable_annc_dept = (enable_annc_dept rescue false)
+      if @tmp_enable_annc_dept
+        @annc_depts = annc_depts_translations[locale] rescue []
+      end
+    end
     if tags.blank?
       tags = ["all"]
     end
diff --git a/app/helpers/announcements_helper.rb b/app/helpers/announcements_helper.rb
index de51c39..e620167 100644
--- a/app/helpers/announcements_helper.rb
+++ b/app/helpers/announcements_helper.rb
@@ -20,7 +20,9 @@ module AnnouncementsHelper
     end
     '#'+comp.join
   end
-  def data_to_human_type(a,set_tag_ids=nil)
+  def data_to_human_type(a,set_tag_ids=nil,tmp_enable_annc_dept=false,annc_depts=[])
+    tmp_enable_annc_dept = @tmp_enable_annc_dept if @tmp_enable_annc_dept
+    annc_depts = @annc_depts if @annc_depts
     statuses = a.statuses_with_classname.collect do |status|
       {
         "status" => status["name"],
@@ -30,7 +32,7 @@ module AnnouncementsHelper
     files = a.bulletin_files.map{|file|  { "file_url" =>  file.file.url, "file_title" => (file.title.blank? ? File.basename(file.file.path) : file.title rescue '') } if file.enabled_for?(locale) } rescue []
     files.delete(nil)
     links = a.bulletin_links.map{|link|  { "link_url" => link.url, "link_title" => (link.title.blank? ? link.url : link.title) } } rescue []
-    author = User.find(a.create_user_id).member_profile.name rescue ""
+    author = tmp_enable_annc_dept ? annc_depts[a.annc_dept] : User.find(a.create_user_id).member_profile.name rescue ""
     desc = a.image_description
     desc = (desc.nil? || desc == "" ? "announcement image" : desc)
     link_to_show = (a.is_external_link? ? a.external_link : OrbitHelper.widget_item_url(a.to_param)) rescue ""