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

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
Tim 2016-10-21 19:33:18 +08:00
parent a9a36d655e 5811f3944e
commit ef141d82c8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/courses_controller.rb
View File

@ -473,7 +473,7 @@ class CoursesController < ApplicationController
if params[:group_id] if params[:group_id]
group = CourseGroup.find params[:group_id] group = CourseGroup.find params[:group_id]
unless group.nil? unless group.nil?
@all_members = student_homework_score(@group.id,0,0,"desc") @all_members = student_homework_score(group.id,0,0,"desc")
end end
else else
@all_members = student_homework_score(0,0,0,"desc") @all_members = student_homework_score(0,0,0,"desc")
@ -564,7 +564,12 @@ class CoursesController < ApplicationController
#添加成员消息状态 #添加成员消息状态
join_course_messages = CourseMessage.where("user_id =? and course_message_type =? and course_id =? and status = ? and viewed =?", User.current.id, 'JoinCourse', @course.id, 1, 0) join_course_messages = CourseMessage.where("user_id =? and course_message_type =? and course_id =? and status = ? and viewed =?", User.current.id, 'JoinCourse', @course.id, 1, 0)
join_course_messages.update_all(:viewed => true) join_course_messages.update_all(:viewed => true)
@tab = params[:tab].to_i || 0
if params[:tab] && params[:tab] == 'boards'
@tab = 4
else
@tab = 0
end
if User.current.allowed_to?(:as_teacher,@course) if User.current.allowed_to?(:as_teacher,@course)
@select_tab = params[:tab] @select_tab = params[:tab]
@issue_custom_fields = IssueCustomField.sorted.all @issue_custom_fields = IssueCustomField.sorted.all

2
app/views/boards/_course_show.html.erb
View File

@ -27,7 +27,7 @@
<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@board.course)) %> <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@board.course)) %>
<% if is_teacher %> <% if is_teacher %>
<%= link_to "添加子栏目", settings_course_path(@board.course.id,4), :class => "link-blue fr mt5" %> <%= link_to "添加子栏目", settings_course_path(@board.course.id,'boards'), :class => "link-blue fr mt5" %>
<% end %> <% end %>
</div> </div>
<div nhname="topic_form"> <div nhname="topic_form">