From 72d683bdb70ff1ba66113175c23177f08b68df3a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 27 Mar 2015 19:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B=E4=B8=8E?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E8=AF=BE=E7=A8=8Bjs=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb      | 6 +++---
 app/helpers/courses_helper.rb              | 2 +-
 app/views/bids/_new_homework_form.html.erb | 3 ++-
 app/views/courses/_set_join.js.erb         | 2 +-
 app/views/layouts/base_courses.html.erb    | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index ebdb18c08..7b3130026 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -30,19 +30,19 @@ class CoursesController < ApplicationController
   def join
     if User.current.logged?
       cs = CoursesService.new
-      join = cs.join_course params,User.current
+      user = User.current
+      join = cs.join_course params,user
       @state = join[:state]
       course = join[:course]
     else
       @state = 5 #未登录
     end
     respond_to do |format|
-      format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => course, :object_id => params[:object_id]} }
+      format.js { render :partial => 'set_join', :locals => {:user => user, :course => course, :object_id => params[:object_id]} }
     end
   rescue Exception => e
     @state = 4 #已经加入了课程
     respond_to do |format|
-      # format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
       format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => nil, :object_id => nil} }
     end
   end
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 384fcaa9b..408783934 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -677,7 +677,7 @@ module CoursesHelper
   #加入课程、退出课程按钮
   def join_in_course_header(course, user, options=[])
     if user.logged?
-      joined = user.member_of_course? course
+      joined = course.members.map{|member| member.user_id}.include? user.id
       text = joined ? ("<em class='pr_arrow'></em>".html_safe + l(:label_course_exit_student)) : ("<em class='pr_add'></em>".html_safe + l(:label_course_join_student))
       url = joined ? join_path(:object_id => course.id) : try_join_path(:object_id => course.id)
       method = joined ? 'delete' : 'post'
diff --git a/app/views/bids/_new_homework_form.html.erb b/app/views/bids/_new_homework_form.html.erb
index 210d96891..9f3bf30c7 100644
--- a/app/views/bids/_new_homework_form.html.erb
+++ b/app/views/bids/_new_homework_form.html.erb
@@ -33,8 +33,9 @@
       <p id="bid_evaluation_num_span" class="c_red" style="padding-left: 90px;"></p>
     </li>
     <li class="ml45">
-      <label>&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
+      <label class="fl">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
       <%= render :partial => 'attachments/new_form', :locals => {:container => bid} %>
+      <div class="cl"></div>
     </li>
     <li class=" ml90" >
       <a class="blue_btn fl c_white" onclick="submit_new_bid('<%= bid_id%>');" href="#"><%= l(:button_create)%></a>
diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb
index f65d6e98b..81c7b42e5 100644
--- a/app/views/courses/_set_join.js.erb
+++ b/app/views/courses/_set_join.js.erb
@@ -1,5 +1,5 @@
 <% if object_id%>
-    $("#<%=object_id%>").replaceWith('<%= escape_javascript join_in_course(course, user) %>');
+    $("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(course, user)) %>");
 <% end %>
 <% if @state %>
 	<% if @state == 0 %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 471902c7a..d35e31dd7 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -77,7 +77,7 @@
               <%= set_course_time @course%>
               <%= link_to "<span class='pr_copy'></span>#{l(:button_copy)}".html_safe, copy_course_course_path(@course.id), :class => "pr_join_a" %>
           <% else%>
-              <%= join_in_course_header(@course, User.current) %>
+              <div id="join_in_course_header"><%= join_in_course_header(@course, User.current) %></div>
           <% end%>
         </div>
         <div class="cl"></div>