|
|
|
@ -80,7 +80,7 @@ class UsersService
|
|
|
|
|
#id用户id
|
|
|
|
|
def show_user(params)
|
|
|
|
|
@user = User.find(params[:id])
|
|
|
|
|
img_url = url_to_avatar(@user)
|
|
|
|
|
img_url = "/images/"+url_to_avatar(@user)
|
|
|
|
|
gender = @user.user_extensions.gender.nil? ? 0 : @user.user_extensions.gender
|
|
|
|
|
work_unit = get_user_work_unit @user
|
|
|
|
|
location = get_user_location @user
|
|
|
|
@ -224,7 +224,7 @@ class UsersService
|
|
|
|
|
membership.sort! {|older, newer| newer.created_on <=> older.created_on }
|
|
|
|
|
course_list = []
|
|
|
|
|
membership.each do |mp|
|
|
|
|
|
course_list << {:course => mp.course,:img_url => url_to_avatar(mp.course),:current_user_is_member => current_user.member_of_course?(mp.course),:current_user_is_teacher => is_course_teacher(current_user,mp.course)}
|
|
|
|
|
course_list << {:course => mp.course,:img_url => "/images/"+url_to_avatar(mp.course),:current_user_is_member => current_user.member_of_course?(mp.course),:current_user_is_teacher => is_course_teacher(current_user,mp.course)}
|
|
|
|
|
end
|
|
|
|
|
course_list
|
|
|
|
|
end
|
|
|
|
|