From 79bc9240b7be558fb6e597ca5afd2adb808ba6bb Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Fri, 27 Sep 2013 12:15:16 +0800
Subject: [PATCH] email hide show facility available

---
 app/models/user/user.rb                                  | 1 +
 app/views/admin/users_new_interface/_js_and_css.html.erb | 1 +
 app/views/admin/users_new_interface/_user_basic.html.erb | 8 +++++++-
 app/views/admin/users_new_interface/show.html.erb        | 1 +
 .../panel/member/front_end/member_lists/index.html.erb   | 9 +++++++--
 .../panel/member/front_end/member_lists/show.html.erb    | 3 ++-
 6 files changed, 19 insertions(+), 4 deletions(-)

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 %>
         </div>
       </div>
-
+      <div class="control-group">
+        <%= f.label "Disable email", :class=>"control-label muted" %>
+        <div class="controls">
+          <%= f.check_box :email_hidden %>
+        </div>
+      </div>
+                
       <!-- ID Number -->
       <div class="control-group">
         <%= 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("<i class='icon-edit'></i> #{t(:edit)}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-mini" ) if is_admin?%>
                   <%= link_to("<i class='icons-cycle'></i> #{t("users.change_passwd")}".html_safe,admin_users_new_interface_edit_passwd_path(@user),:class=>"btn btn-mini" ) if is_admin?%>
               </div>
+           
             </div>
 
             <div id="member-roles" class="nano">
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 %>
 									</li>
 									<% end %>
-									<li><b class="o-members-label"><%= t("users.email")%></b><%= member.email %></li>
+
+									<% if !member.email_hidden? %>
+										<li><b class="o-members-label"><%= t("users.email")%></b><%= member.email %></li>
+									<% end %>
 									<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>
 								</ul>
 							</li>
@@ -79,7 +82,9 @@
 									%>
 									<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %></b><%= @job_title %></li>
 									<% end %>
-									<li><b class="o-members-label"><%= t("users.email")%></b> <%= member.email %></li>
+									<% if !member.email_hidden? %>
+										<li><b class="o-members-label"><%= t("users.email")%></b> <%= member.email %></li>
+									<% end %>
 									<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>
 								</ul>
 							</li>
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 @@
 					<td><%= t('users.name')%></td>
 					<td><%= @member.name%></td>
 				</tr>
+				<% if !@member.email_hidden? %>
 				<tr>
 					<td><%= t('users.email')%></td>
 					<td><a href="mailto:<%= @member.email %>"><%= @member.email %></a></td>
 				</tr>
-				
+				<% end %>
 				<% if !@member.office_tel.blank? %>
 				<tr>
 					<td><%= t('users.office_tel')%></td>