重构user.find

ouyang
alan 10 years ago
parent 1f5c90185a
commit ce6d63ccaf

@ -1064,6 +1064,17 @@ class User < Principal
anonymous_user
end
# refactor User model find function,
# return anonymous user when can not find user id = user_id
def self.find user_id
user = User.new
begin
user = super
rescue
user = self.anonymous
end
user
end
# Salts all existing unsalted passwords
# It changes password storage scheme from SHA1(password) to SHA1(salt + SHA1(password))
# This method is used in the SaltPasswords migration and is to be kept as is

@ -38,19 +38,10 @@
</li>
<li class="fontGrey3 mb5"><%= item.try(:highlight).try(:description) ? item.highlight.description[0].html_safe : item.description %></li>
<li class="f12 fontGrey2">
<%= course_teacher = User.where("id = ?", item.tea_id).first if item.tea_id? %>
<% if course_teacher.nil? %>
<span class="mr30">教师:无</span>
<span class="mr30">授课时间:<%= item.time.to_s + item.term%></span>
<span class="mr30">更新时间:<%= format_date(item.updated_at)%></span>
<span class="mr30">单位:无</span>
<%= else %>
<span class="mr30">教师:<%= User.find(item.tea_id).realname %></span>
<span class="mr30">授课时间:<%= item.time.to_s + item.term%></span>
<span class="mr30">更新时间:<%= format_date(item.updated_at)%></span>
<span class="mr30"><%= course_teacher.user_extensions.occupation.present? ? '单位:'+ course_teacher.user_extensions.occupation : ''%></span>
<% end %>
</li>
<span class="mr30"><%= User.find(item.tea_id).user_extensions.occupation.present? ? '单位:'+User.find(item.tea_id).user_extensions.occupation : ''%></span></li>
</ul>
</li>
<div class="cl"></div>
@ -65,8 +56,7 @@
<div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">资源</span></div>
<div class="cl"></div>
</li>
<%= item_author = User.where("id = ?", item.author_id).first if item.author_id? %>
<li class="f12 fontGrey2"><span class="mr30">发布者:<%= item_author.nil? ? '无' : item_author.login%><%= item_author.realname unless item_author.nil? %></span>
<li class="f12 fontGrey2"><span class="mr30">发布者:<%= User.find(item.author_id).login%><%= User.find(item.author_id).realname%></span>
<!--<span class="mr30">职称:<%#= get_technical_title User.find(item.author_id) %></span>-->
<span class="mr30">发布时间:<%= format_date(item.created_on)%></span>
<span class="mr30">下载次数:<%= item.downloads%>次</span>
@ -86,8 +76,7 @@
<div class="cl"></div>
</li>
<li class="fontGrey3 mb5"><%= item.try(:highlight).try(:description) ? item.highlight.description[0].html_safe : item.description%></li>
<%= project_admin = User.where("id = ?", item.user_id).first if item.user_id? %>
<li class="f12 fontGrey2"><span class="mr30">管理人员:<%= project_admin.nil? ? '无' : project_admin.login %></span><span class="mr30">更新时间:<%= date_format_local( Project.find(item.id).updated_on) %></span></li>
<li class="f12 fontGrey2"><span class="mr30">管理人员:<%= item.user_id ? User.find(item.user_id).login : '无' %></span><span class="mr30">更新时间:<%= date_format_local( Project.find(item.id).updated_on) %></span></li>
</ul>
</li>
<div class="cl"></div>
@ -103,8 +92,7 @@
<div class="cl"></div>
</li>
<li class="fontGrey3 mb5"><%= item.try(:highlight).try(:content) ? item.highlight.content[0].html_safe : item.content.html_safe%></li>
<%= memo_author = User.where("id = ?", item.author_id).first if item.author_id? %>
<li class="f12 fontGrey2"><span class="mr30">发帖人:<%= memo_author.nil? ? '无' : memo_author.login %></span><span class="mr30">更新时间:<%= format_date( item.updated_at) %></span></li>
<li class="f12 fontGrey2"><span class="mr30">发帖人:<%= item.author_id ? User.find(item.author_id).login : '无' %></span><span class="mr30">更新时间:<%= format_date( item.updated_at) %></span></li>
</ul>
</li>
<div class="cl"></div>

Loading…
Cancel
Save