From b20cacc50e07aa6d701176686b1820342059dff2 Mon Sep 17 00:00:00 2001
From: Bohung <bohung@rulingcom.com>
Date: Mon, 19 Apr 2021 11:56:33 +0800
Subject: [PATCH] Fix bug.

---
 app/controllers/announcements_controller.rb       | 2 +-
 app/views/admin/announcements/_form.html.erb      | 9 +++++++++
 app/views/admin/announcements/_form_file.html.erb | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
index a8d5b8f..deba329 100644
--- a/app/controllers/announcements_controller.rb
+++ b/app/controllers/announcements_controller.rb
@@ -565,7 +565,7 @@ class AnnouncementsController < ApplicationController
     } } rescue []
     files = announcement.bulletin_files.map do |file|  
               { "file_url" =>  "/xhr/announcements/file/#{file.id}/#{file['file']}" + "\" title=\"#{file.file_title}", 
-                "file_title" => (file.title.blank? ? URI.unescape(File.basename(file.file.path)) : file.title rescue '') } if file.enabled_for?(locale)
+                "file_title" => (file.title.blank? ? URI.unescape(File.basename(file.file.path)) : file.title rescue '') } rescue nil if file.enabled_for?(locale)
             end rescue []
     files.delete(nil)
     files.each do |file|
diff --git a/app/views/admin/announcements/_form.html.erb b/app/views/admin/announcements/_form.html.erb
index 5c4c563..3dbb71f 100644
--- a/app/views/admin/announcements/_form.html.erb
+++ b/app/views/admin/announcements/_form.html.erb
@@ -509,6 +509,14 @@
     })
   </script>
 <% end %>
+<style type="text/css">
+	[aria-describedby] ul.dropdown-menu {
+	    display: block;
+	}
+	[aria-describedby] .checkbox  input{
+		margin-left: 0;
+	}
+</style>
 <script>
   function Appendzero(obj)
   {
@@ -517,6 +525,7 @@
   }
   function add_click_for_privacy()
   {
+  	$('.add-on.btn-group').off('show.bs.tooltip').on('show.bs.tooltip',function(){$(this).find('ul').toggleClass('show')});
     $(".privacy-changer-btn").off('click')
     $(".privacy-changer-btn").click(function(){
         var val = $(this).attr('for')
diff --git a/app/views/admin/announcements/_form_file.html.erb b/app/views/admin/announcements/_form_file.html.erb
index 84b03db..5718c9b 100644
--- a/app/views/admin/announcements/_form_file.html.erb
+++ b/app/views/admin/announcements/_form_file.html.erb
@@ -65,7 +65,7 @@
         <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
       </span>
     <% end %>
-    <span class="add-on btn-group btn" style="background: white;border: 0;margin-left: 1em;">
+    <span class="add-on btn-group btn" style="background: white;border: 0;margin-left: 1em;" title="<%=t('site.edit_members.privacy_setting')%>">
       <%  case form_file.privacy_type
             when "public"
               icon = "icons-earth"