Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/admin_controller.rb

@@ -354,7 +354,7 @@ class AdminController < ApplicationController
     @schools = School.where('1=1')
     end
     @school_count = @schools.count
-    @school_pages = Paginator.new @school_count, per_page_option, params['page'] || 1
+    @school_pages = Paginator.new @school_count, 100, params['page'] || 1
     @schools = paginateHelper @schools,100
     respond_to do |format|
       format.html

app/controllers/courses_controller.rb

@@ -31,17 +31,17 @@ class CoursesController < ApplicationController
 
   def join
     if User.current.logged?
-      if params[:role] == 10
+     # if params[:role] == 10
         cs = CoursesService.new
         @user = User.current
-        join = cs.join_course params,user
+        join = cs.join_course params,@user
         @state = join[:state]
         @course = join[:course]
-      else
-        @course = Course.find_by_id params[:object_id]
-        CourseMessage.create(:user_id => @course.tea_id, :course_id => @course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest')
-        @state = 6
-      end
+      # else
+      #   @course = Course.find_by_id params[:object_id]
+      #   CourseMessage.create(:user_id => @course.tea_id, :course_id => @course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest')
+      #   @state = 6
+      # end
     else
       @state = 5 #未登录
     end

app/services/courses_service.rb

@@ -308,15 +308,31 @@ class CoursesService
       if course_endTime_timeout? course
         @state = 2
       else
-        if current_user.member_of_course?(course)
+        if current_user.member_of_course?(course) #如果已经是成员
+          if params[:course_password] == course.password
+            #如果加入角色为学生
+            if params[:role] == "10"
               @state = 3
+            else
+              #如果加入角色为教师或者教辅
+              CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
+              @state = 6
+            end
+          else
+            @state = 1
+          end
         else
           if params[:course_password] == course.password
+            if params[:role] == "10"
               members = []
               members << Member.new(:role_ids => [10], :user_id => current_user.id)
               course.members << members
               StudentsForCourse.create(:student_id => current_user.id, :course_id => params[:object_id])
               @state = 0
+            else
+              CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
+              @state = 6
+            end
           else
             @state = 1
           end

app/views/courses/join.js.erb

@@ -1,4 +1,4 @@
-<% if @object_id && @state != 6%>
+<% if @object_id && @state != 6 && @state !=4 %>
 $("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(@course, @user)) %>");
 <% end %>
 <% if @state %>