diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 8e729b083..5aab1df49 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1704,7 +1704,7 @@ class UsersController < ApplicationController sql = "user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))" end if User.current != @user - sql += "and user_id = #{@user.id}" + sql += " and user_id = #{@user.id}" end else if User.current != @user diff --git a/app/views/users/_courses_list.html.erb b/app/views/users/_courses_list.html.erb index ab6c8ff81..d79215f9a 100644 --- a/app/views/users/_courses_list.html.erb +++ b/app/views/users/_courses_list.html.erb @@ -10,7 +10,7 @@
" class="syllabus_class_title fl" target="_blank" title="<%= allow_visit ? "" : "私有班级不可访问" %>"><%= course.name %> <%= course.is_public == 0 ? '私有' : '公开' %> - +
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index 7b3509f2c..131354df0 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -80,7 +80,7 @@
<%# 局部刷新:修改xissue属性 %> - <% if User.current.member_of?(activity.project) %> + <% if User.current.member_of?(activity.project) && !activity.nil? && !activity.status.nil? %> <% unless params[:action] == "index" %>
<%= render :partial => 'users/project_issue_detail', :locals => {:activity => activity} %> diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb index 9013c41f4..f757b170b 100644 --- a/app/views/users/_user_course_list.html.erb +++ b/app/views/users/_user_course_list.html.erb @@ -23,7 +23,7 @@ :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级:":"私有班级:")+course.name+"("+current_time_and_term(course)+")"%> <% teacher = User.where("id=?",course.tea_id).first%> - <%='主讲老师:'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %> + <%='创建老师:'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>