diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb index ce0d7481a..b92223edc 100644 --- a/app/controllers/blog_comments_controller.rb +++ b/app/controllers/blog_comments_controller.rb @@ -71,7 +71,7 @@ class BlogCommentsController < ApplicationController else#如果是回复被删， if params[:course_id] #如果带了course_id过来了，那么这是要跳到课程大纲去的 @article.delete - redirect_to show_course_outline_course_path(:id=>params[:course_id]) + redirect_to syllabus_course_path(:id=>params[:course_id]) else root = @article.root @article.delete @@ -131,7 +131,7 @@ class BlogCommentsController < ApplicationController respond_to do |format| format.html { if params[:course_id] #如果呆了course_id过来了，那么这是要跳到课程大纲去的 - redirect_to show_course_outline_course_path(:id=>params[:course_id]) + redirect_to syllabus_course_path(:id=>params[:course_id]) else redirect_to user_blog_blog_comment_path(:user_id=>@article.author_id,:blog_id=>@article.blog_id,:id=>@article) end diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index c9d632fec..0a3c61c90 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -740,7 +740,7 @@ class CoursesController < ApplicationController end #显示课程大纲 - def show_course_outline + def syllabus @article = BlogComment.find(@course.outline) respond_to do |format| format.html {render :layout => 'base_courses'} diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d79083919..0d9588d24 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -368,12 +368,22 @@ class UsersController < ApplicationController if User.current == @user @page = params[:page] ? params[:page].to_i + 1 : 0 user_course_ids = @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")" - @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true) - if @is_teacher - @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10) - else - @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids} and publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10) + + #判断当前用户在当前课程的身份 + visibleCourse = @user.courses.empty? ? [] : @user.courses.visible + homework_ids = [] + visibleCourse.each do |course| + if User.current.allowed_to?(:as_teacher,course) + homeworks = HomeworkCommon.where("course_id = #{course.id}") + homework_ids << homeworks.pluck(:id) unless homeworks.empty? + else + homeworks = HomeworkCommon.where("course_id = #{course.id} and publish_time <= '#{Date.today}'") + homework_ids << homeworks.pluck(:id) unless homeworks.empty? + end end + visible_homework_ids = homework_ids.size == 0 ? "(-1)" :"(" + homework_ids.join(",") + ")" + @homework_commons = HomeworkCommon.where("id in #{visible_homework_ids}").order("created_at desc").limit(10).offset(@page * 10) + @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true) @is_in_course = params[:is_in_course].to_i || 0 respond_to do |format| format.js diff --git a/app/views/courses/_course_outlines_list.html.erb b/app/views/courses/_course_outlines_list.html.erb index 6710c22ba..42ce30113 100644 --- a/app/views/courses/_course_outlines_list.html.erb +++ b/app/views/courses/_course_outlines_list.html.erb @@ -2,11 +2,11 @@
请选择课程大纲
-
+
- +
<%= form_tag(url_for(:controller=>'courses',:action=>'set_course_outline',:id=>course.id),:method=>'post',:remote=>'true') do %> diff --git a/app/views/courses/set_course_outline.js.erb b/app/views/courses/set_course_outline.js.erb index af075d2b8..a43a62c7d 100644 --- a/app/views/courses/set_course_outline.js.erb +++ b/app/views/courses/set_course_outline.js.erb @@ -1,8 +1,8 @@ hideModal(); <%if @course.tea_id == User.current.id && @course.outline == 0 %> <% else %> - $("#course_outline_bar").html(' ') + $("#course_outline_bar").html(' ') <%end %> <%if @is_in_show_outline_page && @is_in_show_outline_page == 'Y'%> - window.location.href='<%=show_course_outline_course_path(@course) %>'; + window.location.href='<%=syllabus_course_path(@course) %>'; <% end %> diff --git a/app/views/courses/show_course_outline.html.erb b/app/views/courses/syllabus.html.erb similarity index 100% rename from app/views/courses/show_course_outline.html.erb rename to app/views/courses/syllabus.html.erb diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index 66d25a4b1..8814d1043 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -22,8 +22,11 @@ <% end %>
- - <%= l(:label_technical_support) %>白   羽 + + <%#= l(:label_technical_support) %> + + + 请加入：师姐答疑群
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 305eaaa29..98e8f378d 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -89,11 +89,11 @@ <%if User.current && @course.tea_id == User.current.id && (@course.outline == 0 || BlogComment.where(:id=>@course.outline).count == 0) %> <% elsif User.current && @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0%> - - <% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course)%> - - <% elsif User.current && @course.tea_id != User.current.id && @course.is_public?%> - + + <% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course) && @course.outline != 0%> + + <% elsif User.current && @course.tea_id != User.current.id && @course.is_public? && @course.outline != 0%> + <%else%> <%end %> diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 678fac93b..b05afc63b 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -554,14 +554,14 @@ ">您增加了新的课程成员：
  • - <%= link_to User.find(ma.course_message_id), user_path(ma.course_message_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", + <%= link_to User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ? User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")", user_path(ma.course_message_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :onmouseover => "message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>