From e5874283f14865883e4137cce0a000892013a547 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 5 Nov 2014 14:13:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E5=AE=9E?=
 =?UTF-8?q?=E8=B7=B5=E5=88=97=E8=A1=A8=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=93=BE=E6=8E=A5=202.=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=203.=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=9C=A8=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E8=AF=BE=E7=A8=8B=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E9=9B=86=E5=90=88=E7=9A=84=E6=96=B9=E6=B3=95=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb              |  3 +--
 app/views/bids/_bid_homework_show.html.erb | 12 +++++++++---
 app/views/layouts/base_homework.html.erb   |  2 +-
 app/views/welcome/_course_list.html.erb    | 20 ++++++++++----------
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index eeedbd19d..ba77d1edd 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -343,8 +343,7 @@ module CoursesHelper
   end
   #获取当前用户在指定作业下提交的作业的集合
   def cur_user_homework_for_bid bid
-    cur_user_homework = HomeworkAttach.where("user_id = ? and bid_id = ?",User.current,bid.id)
-    cur_user_homework
+    bid.homeworks.where("user_id = ?",User.current)
   end
 
   #判断当前用户对指定作业是否已经评价过
diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index f098de895..bf5f700cb 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -23,10 +23,16 @@
                   <%= link_to(bid.name, course_for_bid_path(bid), :class => 'bid_path') %>
                 </span>
                 <span style="float: right">
-                  <% if(User.current.logged? && (!Member.where('user_id = ? and course_id = ?', User.current.id, bid.courses.first.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, bid.courses.first.id).first.roles&Role.where('id = ? or id = ? or id =?',5, 10, 7)).size >0)) %>
+                  <% if User.current.logged? && is_cur_course_student(@course) %>
                      <% cur_user_homework = cur_user_homework_for_bid(bid) %>
-                      <% if cur_user_homework!= nil && cur_user_homework.count == 0 %>
-                          <%= link_to l(:label_commit_homework),new_homework_attach_path(bid)  %>
+                      <% if cur_user_homework!= nil && cur_user_homework.empty? %>
+                          <% if bid.comment_status == 0 %>
+                            <%= link_to l(:label_commit_homework),new_exercise_book_path(bid)  %>
+                          <% else %>
+                              <span title="只有开启匿评之前才能创建作业哦！">
+                                <a style="color:#8e8e8e;">提交作业</a>
+                              </span>
+                          <% end %>
                       <% else %>
                           <span style="color: green; float: right">
                             <%= l(:lable_has_commit_homework)%>
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index e91d0c700..65b57598a 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -79,7 +79,7 @@
                                 <td style="vertical-align: top;font-size: 15px;">
                                   <span style=" word-wrap: break-word; word-break: break-all">
                                     <strong>
-                                      <%= link_to course.name.to_s, homework_course_path(course) if course %>
+                                      <%= link_to "返回课程主页", course_path(course) if course %>
                                     </strong>
                                   </span>
                                 </td>
diff --git a/app/views/welcome/_course_list.html.erb b/app/views/welcome/_course_list.html.erb
index 5fdd8cf3d..c33cc841e 100644
--- a/app/views/welcome/_course_list.html.erb
+++ b/app/views/welcome/_course_list.html.erb
@@ -5,17 +5,17 @@
       </div>
       <!-- 上左下右 -->
       <div class='desc_item'>
-                    <span class=''>
-                     <% unless course.is_public == 1 %>
-                        <span class="private_project"><%= l(:label_private) %></span>
-                     <% end %>
-                     <%= link_to(course.name.truncate(30, omission: '...')+":", course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
+        <span class=''>
+         <% unless course.is_public == 1 %>
+            <span class="private_project"><%= l(:label_private) %></span>
+         <% end %>
+         <%= link_to(course.name.truncate(30, omission: '...')+":", course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
 
-                    </span>
-                    <span class='font_bolder'>
-                        <%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>
-                      <%#=course.try(:teacher).try(:name)%>
-                    </span>
+        </span>
+        <span class='font_bolder'>
+            <%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>
+          <%#=course.try(:teacher).try(:name)%>
+        </span>
       </div>
       <div class='desc_item text_nowrap'>
         [<%= get_course_term course %>]