diff --git a/app/models/user/user.rb b/app/models/user/user.rb
index 9e1490673..cce601f3d 100644
--- a/app/models/user/user.rb
+++ b/app/models/user/user.rb
@@ -16,6 +16,7 @@ class User
field :first_name, localize: true
field :last_name, localize: true
field :email
+ field :email_hidden, :type => Boolean, :default => false
field :sex, :default => 'unknown'
field :office_tel
field :cache_dept,type: Hash
diff --git a/app/views/admin/users_new_interface/_js_and_css.html.erb b/app/views/admin/users_new_interface/_js_and_css.html.erb
index 8c2c42350..c6336a8a8 100644
--- a/app/views/admin/users_new_interface/_js_and_css.html.erb
+++ b/app/views/admin/users_new_interface/_js_and_css.html.erb
@@ -6,6 +6,7 @@
<%= stylesheet_link_tag "lib/main-list" %>
<%= stylesheet_link_tag "lib/filter" %>
<%= stylesheet_link_tag "lib/member" %>
+ <%= stylesheet_link_tag "lib/togglebox" %>
<% end -%>
<% content_for :page_specific_javascript do -%>
diff --git a/app/views/admin/users_new_interface/_user_basic.html.erb b/app/views/admin/users_new_interface/_user_basic.html.erb
index 15e416644..84e6ee5de 100644
--- a/app/views/admin/users_new_interface/_user_basic.html.erb
+++ b/app/views/admin/users_new_interface/_user_basic.html.erb
@@ -94,7 +94,13 @@
<%= f.email_field :email %>
-
+
+ <%= f.label "Disable email", :class=>"control-label muted" %>
+
+ <%= f.check_box :email_hidden %>
+
+
+
<%= f.label t("users.sid"),:class=>"control-label muted" %>
diff --git a/app/views/admin/users_new_interface/show.html.erb b/app/views/admin/users_new_interface/show.html.erb
index 216177e27..ab13b7914 100644
--- a/app/views/admin/users_new_interface/show.html.erb
+++ b/app/views/admin/users_new_interface/show.html.erb
@@ -22,6 +22,7 @@
<%= link_to(" #{t(:edit)}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-mini" ) if is_admin?%>
<%= link_to(" #{t("users.change_passwd")}".html_safe,admin_users_new_interface_edit_passwd_path(@user),:class=>"btn btn-mini" ) if is_admin?%>
+
diff --git a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb
index 46c2fa52b..13ec1e676 100644
--- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb
+++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb
@@ -38,7 +38,10 @@
<%= @job_title %>
<% end %>
-
<%= t("users.email")%><%= member.email %>
+
+ <% if !member.email_hidden? %>
+
<%= t("users.email")%><%= member.email %>
+ <% end %>
<%= t("users.office_tel")%><%= member.office_tel %>
@@ -79,7 +82,9 @@
%>
<%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %><%= @job_title %>
<% end %>
-
<%= t("users.email")%> <%= member.email %>
+ <% if !member.email_hidden? %>
+
<%= t("users.email")%> <%= member.email %>
+ <% end %>
<%= t("users.office_tel")%><%= member.office_tel %>
diff --git a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb
index 5df3ce4c9..6fbcd764c 100644
--- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb
+++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb
@@ -9,11 +9,12 @@
<%= t('users.name')%> |
<%= @member.name%> |
+ <% if !@member.email_hidden? %>
<%= t('users.email')%> |
<%= @member.email %> |
-
+ <% end %>
<% if !@member.office_tel.blank? %>
<%= t('users.office_tel')%> |