From 61ba2c47ee66d9bd82c89c9a4549307670f111e2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 15 Jul 2014 09:43:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=AD=E4=BD=9C=E4=B8=9A=E4=B8=BA=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=97=B6=E4=BD=9C=E4=B8=9A=E6=98=BE=E7=A4=BA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9C=AA=E6=94=B9=E5=8F=98=E7=9A=84=E9=97=AE=E9=A2=98=202.?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E9=A1=B9=E7=9B=AE=E8=BF=87=E9=95=BF=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=9C=81=E7=95=A5=E5=8F=B7=E6=98=BE=E7=A4=BA=E5=92=8C?=
 =?UTF-8?q?=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=8A=A8=E5=88=B0=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=9A=84=E6=B0=94=E6=B3=A1=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/bids_controller.rb     | 2 +-
 app/views/bids/_homework_list.html.erb | 4 +++-
 app/views/bids/show_courseEx.html.erb  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index b9f9245c8..ef0be71ac 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -482,7 +482,7 @@ class BidsController < ApplicationController
         #ended
       end
 
-      if @bid.homework_type == 1
+      if @bid.homework_type
         @homework = HomeworkAttach.new
         #@homework_list = @bid.homeworks
         #增加作业按评分排序，
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index 9f6b45dbd..a8f1f4356 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -86,10 +86,12 @@
           </tr>
 
           <tr>
-            <td>
+            <td style="width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
               <strong>开发项目</strong>:&nbsp;
                   <% if homework.project != nil %>
+                    <span title="<%= homework.project.name %>">
                       <%= link_to homework.project.name,project_path(homework.project.id)%>
+                    </span>
                   <% else %>
                       暂无
                   <% end %>
diff --git a/app/views/bids/show_courseEx.html.erb b/app/views/bids/show_courseEx.html.erb
index 039de6b7a..992abfd96 100644
--- a/app/views/bids/show_courseEx.html.erb
+++ b/app/views/bids/show_courseEx.html.erb
@@ -1,4 +1,4 @@
-<% if @bid.homework_type == Bid::HomeworkFile %>
+<% if @bid.homework_type %>
     <!-- 提交文件类型 -->
     <%= render :partial => 'homework' %>