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

app/controllers/courses_controller.rb

@@ -473,7 +473,7 @@ class CoursesController < ApplicationController
     if params[:group_id]
       group = CourseGroup.find params[:group_id]
       unless group.nil?
-        @all_members = student_homework_score(@group.id,0,0,"desc")
+        @all_members = student_homework_score(group.id,0,0,"desc")
       end
     else
       @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.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)
       @select_tab = params[:tab]
       @issue_custom_fields = IssueCustomField.sorted.all

app/views/boards/_course_show.html.erb

@@ -27,7 +27,7 @@
 
     <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@board.course)) %>
     <% 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 %>
   </div>
   <div nhname="topic_form">