From 6ab1269c01217ceae0514ac9477b21d0cea0ee58 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 15 Jul 2016 09:16:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E6=A1=86=E5=8A=A0=E5=85=A5=E9=87=8D=E5=A4=8D=E7=8F=AD?=
 =?UTF-8?q?=E7=BA=A7=E6=8F=90=E7=A4=BA=E6=9C=89=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/courses.rb        |  5 +----
 app/controllers/wechats_controller.rb | 14 +++++++++++++-
 app/services/courses_service.rb       |  6 +++---
 app/views/courses/_set_join.js.erb    |  6 +++---
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 5908ef866..57fda4af1 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -393,10 +393,7 @@ module Mobile
           authenticate!
 
           course = Course.find(params[:course_id])
-          exercises = course.exercises
-          exercises.each do |v|
-            v[:coursename] = course.nil? ? "未知" : course.name
-          end
+          exercises = course.exercises.where("exercise_status <> 1")
           present :data,exercises,with:Mobile::Entities::Exercise
           present :status,0
         end
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 5f1e54b8a..ef935c597 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -208,8 +208,20 @@ class WechatsController < ActionController::Base
     course = Course.where(invite_code: params[:invite_code]).first if params[:invite_code]
     raise "班级不存在，请确认您的邀请码是否输入正确，谢谢！" unless course
 
+    #取出用户角色类型
+    role = 10
+
+    case user.user_extensions.identity
+      when 0
+        role = "9"
+      when 1
+        role = "10"
+      when 2
+        role = "7"
+    end
+
     cs = CoursesService.new
-    status = cs.join_course({invite_code: course.invite_code}, user)
+    status = cs.join_course({role:role,invite_code: course.invite_code}, user)
     logger.info status
     if status[:state] != 0
       raise CoursesService::JoinCourseError.message(status[:state])
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 294c77019..fe23dc377 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -326,8 +326,8 @@ class CoursesService
     define_error [
         0, '加入成功',
         1, '密码错误',
-        2, '课程已过期 请联系课程管理员重启课程。',
-        3, '您已经加入了课程',
+        2, '班级已过期 请联系班级管理员重启班级。',
+        3, '您已经加入了班级',
         4, '您的邀请码不正确',
         5, '您还未登录',
         6, '申请成功，请等待审核完毕',
@@ -522,7 +522,7 @@ class CoursesService
   def course_attachments params
     result = []
     course = Course.find(params[:course_id])
-    attachments = course.attachments.order("created_on ")
+    attachments = course.attachments.where("is_publish = 1").order("created_on desc")
     if !params[:name].nil? && params[:name] != ""
       attachments.each do |atta|
         result << atta if atta.filename.include?(params[:name])
diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb
index dbdf3d7f3..822757dfe 100644
--- a/app/views/courses/_set_join.js.erb
+++ b/app/views/courses/_set_join.js.erb
@@ -10,12 +10,12 @@
 	<% elsif @state == 1 %>
 		alert("密码错误");
 	<% elsif @state == 2 %>
-		alert("课程已过期\n请联系课程管理员重启课程。(在配置课程处)");
+		alert("班级已过期\n请联系班级管理员重启班级。(在配置班级处)");
 	<% elsif @state == 3 %>
-        alert("您已经加入了课程");
+        alert("您已经加入了班级");
         window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= course.id%>"
     <% elsif @state == 4 %>
-        alert("您加入的课程不存在");
+        alert("您加入的班级不存在");
     <% elsif @state == 5 %>
         alert("您还未登录");
     <% elsif @state == 6 %>