Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

10 years ago · 17afc1a9fe
parent e11d5fccd4 b172fa7512
commit 17afc1a9fe
2 changed files with 200 additions and 87 deletions
--- a/app/views/files/_attachement_list.html.erb
+++ b/app/views/files/_attachement_list.html.erb
@ -27,7 +27,7 @@
                   :id => '_file',
                   :class => ie8? ? '':'file_selector',
                   :multiple => true,
-                   :onchange => 'addInputFiles(this,"'+ checkBox.to_s+'");',
+                   :onchange => 'addInputFilesCourseSource(this,"'+ checkBox.to_s+'");',
                   :style => ie8? ? '': 'display:none',
                   :data => {
                           :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js