From 8609263ec6b57debbff360030b65c27b81341b1b Mon Sep 17 00:00:00 2001
From: Spen <spen821@gmail.com>
Date: Tue, 5 Nov 2013 17:35:18 +0800
Subject: [PATCH] fix member show fields

---
 .../member_lists/_show_roles.html.erb         | 29 +-------------
 .../front_end/member_lists/show.html.erb      | 39 ++++++++++++-------
 2 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb
index 7fee0d91d..443c38356 100644
--- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb
+++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb
@@ -1,26 +1,3 @@
-          <!--       <% 
-                  @status = @member.role_statuses.where(:role_id=>show_roles.id)
-
-                  if !@status.blank?
-                %>
-                <tr>
-                  <td><%= t('status')%></td>
-                  <td><%= show_attribute_value(@member.role_statuses.where(:role_id=>show_roles.id).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
-                </tr>
-
-                <% end -%> -->
-
-                <% 
-                  @category = @member.role_categorys.where(:role_id=>show_roles.id)
-
-                  if !@category.blank?
-                %>
-                <tr>
-                  <td><%= t('category')%></td>
-                  <td><%= show_attribute_value(@member.role_categorys.where(:role_id=>show_roles.id).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
-                </tr>
-
-                <% end -%>
 
                 <% show_roles.attribute_fields.where(:disabled=>false).asc(:_id).each do |rf| %>
 
@@ -34,16 +11,12 @@
                         @rodata = nil
                       end
 
-                    if !@rodata.blank? and !@member.get_attribute_value(rf).get_value_by_locale(I18n.locale).blank?
+                    if !@rodata.blank? and !@member.get_attribute_value(rf).get_value_by_locale(I18n.locale).blank? and rf.key != 'job_title'
                   %>
 
                     <tr>
-                    <% if (rf.title == "Academic Position" || rf.title == "職稱")%>
                       <td><%= rf.title %></td>
                       <td><%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
-                      </tr>
-                     <%end%>
-
                     </tr>
 
                     <% end -%>
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 1c765a65d..4b74a4eef 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
@@ -3,25 +3,42 @@
 		<table>
 			<tbody>
 
-				<%= render :partial=> "show_roles",:collection=>@member.roles.asc(:created_at) %>
+                <% 
+                  @member_role = @member.roles.asc(:created_at).first
+                  @category = @member.role_categorys.where(:role_id=>@member_role.id)
 
+                  if !@category.blank?
+                %>
+                <tr>
+                  <td><%= t('category')%></td>
+                  <td><%= show_attribute_value(@member.role_categorys.where(:role_id=>@member_role.id).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
+                </tr>
+
+                <% end -%>				
+
+				<% @job_title = show_attribute_value(User.get_member_list_attribute_value(@member.id,"teacher","job_title").get_value_by_locale(I18n.locale))
+				   if @job_title != 'NoData' and !@job_title.blank?
+				%>
+				<tr>
+					<td><%= User.get_member_list_attribute_field_name("teacher","job_title") %></td>
+					<td><%= @job_title %></td>
+				</tr>
+				<% end -%>
 				<tr>
 					<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>
 					<td><%= @member.office_tel%></td>
 				</tr>
 				<% end %>
-				
+
 				<% @profile_data.each do |item| %>
 				<% if !item[:value].blank? %>
 				<tr>
@@ -30,9 +47,8 @@
 				</tr>
 				<% end -%>
 				<% end -%>
-				<%= render :partial=> "show_office_field",:collection=>@member.roles.asc(:created_at) %>
 
-				<%= render :partial=> "show_research_field",:collection=>@member.roles.asc(:created_at) %>
+				<%= render :partial=> "show_roles",:collection=>@member.roles.asc(:created_at) %>
 
 			</tbody>
 		</table>
@@ -55,13 +71,13 @@
 					<% if !@intro_data.blank? %>
 
 						<% if !@intro_data.brief_intro.blank? or !@intro_data.complete_list.blank? %>
- 			             <li><a href="#<%= plugin["name"].gsub(' ', '') %>"><%= plugin["name"] %></a></li> 
+						  <li><a href="#<%= plugin["name"].gsub(' ', '') %>"><%= plugin["name"] %></a></li>
 						<% end %>
 
 					<% else %>
 
 						<% if !@data.blank? %>
-						  <li><a href="#<%= plugin["name"].gsub(' ', '') %>"><%= plugin["name"] %></a></li> 
+						  <li><a href="#<%= plugin["name"].gsub(' ', '') %>"><%= plugin["name"] %></a></li>
 						<% end %>
 
 					<% end %>
@@ -82,9 +98,7 @@
 				<% if !@intro_data.blank? %>
 
 					<% if !@intro_data.brief_intro.blank? or !@intro_data.complete_list.blank? %>
-
-						<div class="module-pane" id="<%= plugin["name"].gsub(' ', '') %>"> 
-
+						<div class="module-pane" id="<%= plugin["name"].gsub(' ', '') %>">
 							<%= render :partial => @plugin_partial if !@plugin_partial.blank? %>
 						</div>					
 					<% end %>
@@ -92,8 +106,7 @@
 				<% else %>
 
 					<% if !@data.blank? %>
-						<div class="module-pane" id="<%= plugin["name"].gsub(' ', '') %>"> 
-
+						<div class="module-pane" id="<%= plugin["name"].gsub(' ', '') %>">
 							<%= render :partial => @plugin_partial if !@plugin_partial.blank? %>
 						</div>					
 					<% end %>