jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#1832 不显示无数据的字段，字段名

This commit is contained in:
sw 2015-01-27 11:35:19 +08:00
parent 56700f4d62
commit 5950f0404b
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@ -1961,4 +1961,8 @@ module ApplicationHelper
end
confirm_info
end
def get_technical_title user
#user.user_extensions.technical_title
end
end

45
app/views/layouts/base_users.html.erb
View File

@ -267,27 +267,32 @@
</td>
</tr>
<% end %>
<tr>
<td style=" float: right" width="70px">
<span style="float: right"> <%= l(:label_location) %>：</span>
</td>
<td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
<%= @user.user_extensions.location %>
<%= @user.user_extensions.location_city %>
</td>
</tr>
<tr>
<% if @user.user_extensions.identity == 0 %>
<td style=" float: right" width="70px" >
<span style="float: right"> <%= l(:label_technical_title) %>：</span>
</td>
<td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
<span id = "td_tech_title"></span>
</td>
<% end %>
</tr>
<% unless @user.user_extensions.location.empty?%>
<tr>
<td style=" float: right" width="70px">
<span style="float: right"> <%= l(:label_location) %>：</span>
</td>
<td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
<%= @user.user_extensions.location %>
<%= @user.user_extensions.location_city %>
</td>
</tr>
<% end %>
<% unless @user.user_extensions.technical_title.nil?%>
<tr>
<% if @user.user_extensions.identity == 0 %>
<td style=" float: right" width="70px" >
<span style="float: right"> <%= l(:label_technical_title) %>：</span>
</td>
<td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
<span id = "td_tech_title"></span>
</td>
<% end %>
</tr>
<%end%>
<% if @user.user_extensions.identity == 1 %>
<% if(is_watching?(@user) ) %>
<% if(is_watching?(@user) ) && !@user.user_extensions.student_id.empty? %>
<tr>
<td style=" float: right" width="70px" >
<span style="float: right"> <%= l(:label_bidding_user_studentcode)%>：</span>