Chihyu
/
announcement-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflict

This commit is contained in:
chiu 2020-04-11 17:28:58 +08:00
parent 6851cc868b
commit e25594cc98
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@
<%= render :partial=> "approval_modal" %> <%= render :partial=> "approval_modal" %>
<script type="text/javascript"> <script type="text/javascript">
$(function{
var modal = $("#approvalModal"); var modal = $("#approvalModal");
$(document).on("click", ".approval_button",function(){ $(document).on("click", ".approval_button",function(){
var url = $(this).attr("href"); var url = $(this).attr("href");
@ -28,5 +29,6 @@
modal.find("#object_id").val(params["id"]); modal.find("#object_id").val(params["id"]);
modal.modal("show"); modal.modal("show");
} }
})
</script> </script>
<% end %> <% end %>