diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index bb9a44104..e26901320 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -317,6 +317,14 @@ class TagsController < ApplicationController
when '8'
@obj = OpenSourceProject.find_by_id(obj_id)
@obj_pages, @open_source_projects_results, @results_count = for_pagination(get_open_source_projects_by_tag(selected_tags))
+ when '10'
+ @obj = Attachment.find_by_id(obj_id)
+
+ # modifed by Long Jun
+ # this is used to find the attachments that came from the same project and tagged with the same tag.
+ #@result = get_attachments_by_project_tag(selected_tags, @obj)
+ @result = get_attachments_by_tag(selected_tags)
+ @obj_pages, @attachments_results, @results_count = for_pagination(@result)
when '9' then
@obj = Course.find_by_id(obj_id)
@obj_pages, @courses_results, @results_count = for_pagination(get_courses_by_tag(selected_tags))
diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb
index 73b637c22..39c760690 100644
--- a/app/views/attachments/_form_course.html.erb
+++ b/app/views/attachments/_form_course.html.erb
@@ -38,7 +38,7 @@
<%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
-<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()",:class =>"sub_btn" %>
+<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()",:class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
<%= file_field_tag 'attachments[dummy][file]',
:id => '_file',
:class => 'file_selector',
diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb
index b2ef7742c..59f1b66fd 100644
--- a/app/views/files/_attachement_list.html.erb
+++ b/app/views/files/_attachement_list.html.erb
@@ -22,7 +22,7 @@
-
+
<%= file_field_tag 'attachments[dummy][file]',
:id => '_file',
:class => 'file_selector',
diff --git a/app/views/tags/remove_tag_new.js.erb b/app/views/tags/remove_tag_new.js.erb
index 24d52a35f..01edf3e1c 100644
--- a/app/views/tags/remove_tag_new.js.erb
+++ b/app/views/tags/remove_tag_new.js.erb
@@ -1,6 +1,11 @@
//本js使用的新的tag显示方法
<% if @object_flag == "6"%>
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
+ :locals => {:obj => @obj,:non_list_all => false,:object_flag => @object_flag}) %>');
+<% end %>
+<% if @object_flag == "10"%>
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
:locals => {:obj => @obj,:non_list_all => false,:object_flag => @object_flag}) %>');
<% end %>
\ No newline at end of file
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 4dcc4e744..ea385ae28 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -21,7 +21,6 @@ function addFile(inputEl, file, eagerUpload) {
var fileSpan = $('', { 'id': 'attachments_' + attachmentId, 'class':'attachment' });
fileSpan.append(
- $('', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name),
$('', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name),
$('', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('descriptionPlaceholder') } ).toggle(!eagerUpload),
$(''+$(inputEl).data('fieldIsPublic')+':').attr({ 'class': 'ispublic-label' }) ,