saurabh
/
announcement-test
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug.

This commit is contained in:
BoHung Chiu 2021-04-19 11:56:33 +08:00
parent 5c65442fc9
commit b20cacc50e
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/announcements_controller.rb
View File

@ -565,7 +565,7 @@ class AnnouncementsController < ApplicationController
} } rescue [] } } rescue []
files = announcement.bulletin_files.map do |file| files = announcement.bulletin_files.map do |file|
{ "file_url" => "/xhr/announcements/file/#{file.id}/#{file['file']}" + "\" title=\"#{file.file_title}", { "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 [] end rescue []
files.delete(nil) files.delete(nil)
files.each do |file| files.each do |file|

9
app/views/admin/announcements/_form.html.erb
View File

@ -509,6 +509,14 @@
}) })
</script> </script>
<% end %> <% end %>
<style type="text/css">
[aria-describedby] ul.dropdown-menu {
display: block;
}
[aria-describedby] .checkbox input{
margin-left: 0;
}
</style>
<script> <script>
function Appendzero(obj) function Appendzero(obj)
{ {
@ -517,6 +525,7 @@
} }
function add_click_for_privacy() 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").off('click')
$(".privacy-changer-btn").click(function(){ $(".privacy-changer-btn").click(function(){
var val = $(this).attr('for') var val = $(this).attr('for')

2
app/views/admin/announcements/_form_file.html.erb
View File

@ -65,7 +65,7 @@
<%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %> <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
</span> </span>
<% end %> <% 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 <% case form_file.privacy_type
when "public" when "public"
icon = "icons-earth" icon = "icons-earth"