diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index d051a91f7..bae0232a5 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -109,7 +109,8 @@ class OrgSubfieldsController < ApplicationController
     if SubfieldSubdomainDir.find_by_sql(sql).count == 0
       if @org_subfield.subfield_subdomain_dir
         @sub_dir = @org_subfield.subfield_subdomain_dir
-        @sub_dir.update_attribute(:name, params[:sub_dir_name])
+        @sub_dir = SubfieldSubdomainDir.update(@sub_dir.id, :name => params[:sub_dir_name])
+        #@sub_dir.update_attribute(:name, params[:sub_dir_name])
       else
         @sub_dir = SubfieldSubdomainDir.create(:org_subfield_id => @org_subfield.id, :name => params[:sub_dir_name])
       end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f715cac81..8f4991039 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2109,9 +2109,9 @@ class UsersController < ApplicationController
       end
     elsif params[:type] == "4" #附件
       if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')").order("created_on desc")
       else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')").order("created_on desc")
       end
     elsif params[:type] == "5" #用户资源
       if User.current.id.to_i == params[:id].to_i
diff --git a/app/models/subfield_subdomain_dir.rb b/app/models/subfield_subdomain_dir.rb
index 9897e19ac..2ec93fe05 100644
--- a/app/models/subfield_subdomain_dir.rb
+++ b/app/models/subfield_subdomain_dir.rb
@@ -1,4 +1,5 @@
 class SubfieldSubdomainDir < ActiveRecord::Base
   # attr_accessible :title, :body
   belongs_to :org_subfield
+  validates_exclusion_of :name, :in => %w(setting members org_document_comments)
 end
diff --git a/app/views/org_subfields/update_sub_dir.js.erb b/app/views/org_subfields/update_sub_dir.js.erb
index 7960ca26c..3d42c260b 100644
--- a/app/views/org_subfields/update_sub_dir.js.erb
+++ b/app/views/org_subfields/update_sub_dir.js.erb
@@ -1,11 +1,6 @@
-<% if @exist == false %>
+<% if @exist == false and @sub_dir.valid? %>
     $('#sub_dir_show_<%= @org_subfield.id %>').html('<%= @sub_dir.name %>');
     $('#sub_dir_edit_<%= @org_subfield.id %>').find('input').val('<%= @sub_dir.name %>');
-//    $('#sub_dir_show_<%= @org_subfield.id %>').show();
-//    $('#sub_dir_edit_<%= @org_subfield.id %>').hide();
 <% else %>
     $('#sub_dir_edit_<%= @org_subfield.id %>').find('input').val('<%= @org_subfield.subfield_subdomain_dir.nil? ? '': @org_subfield.subfield_subdomain_dir.name %>');
-//    alert("该目录已存在，请重新输入");
-//    $('#sub_dir_edit_<%#= @org_subfield.id %>').find('input').val('<%#= @org_subfield.subfield_subdomain_dir.nil? ? "未设置":@org_subfield.subfield_subdomain_dir.name %>');
-//    $('#sub_dir_edit_<%#= @org_subfield.id %>').focus();
 <% end %>
\ No newline at end of file