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

app/models/issue.rb

@@ -564,10 +564,8 @@ class Issue < ActiveRecord::Base
   end
   # 缺陷的短描述信息
   def short_description(length = 255)
-    # 不再使用短描述
-    #description.gsub(/<\/?.*?>/,"").html_safe if description
+    description.gsub(/<\/?.*?>/,"").html_safe if description
     #description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
-    description
   end
 
   private :workflow_rule_by_attribute

app/models/news.rb

@@ -76,10 +76,9 @@ class News < ActiveRecord::Base
 
   # 新闻的短描述信息
   def short_description(length = 255)
-    #description.gsub(/<\/?.*?>/,"").html_safe if description
+    description.gsub(/<\/?.*?>/,"").html_safe if description
     #description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
-    # 不再使用短描述
-    description
+    #description
   end
 
   private

app/models/open_source_project.rb

@@ -84,10 +84,10 @@ class OpenSourceProject < ActiveRecord::Base
   # end
 
   def short_description(length = 255)
-    #description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
+    description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
     #description.gsub(/<\/?.*?>/,"").html_safe if description
     # 不再使用短描述
-    description
+    # description
   end
 
   def applied_by?(user)

app/models/project.rb

@@ -630,9 +630,7 @@ class Project < ActiveRecord::Base
   # Returns a short description of the projects (first lines)
   def short_description(length = 255)
     #description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
-    # 不再使用短描述
-   # description.gsub(/<\/?.*?>/,"").html_safe if description
-    description
+   description.gsub(/<\/?.*?>/,"").html_safe if description
   end
 
   def css_classes

app/views/contests/show_attendingcontest.html.erb

@@ -105,18 +105,7 @@
 
         </tr>
         <br/>
-      <br/>
-      <br/>
 
-      <tr style="width:800px;">
-        <span><%= l(:label_work_type) %></span>
-
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px"><%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %></td>
-
-      </tr>
-      <br/>
-      <br/>
         <br/>
 
         <tr style="width:800px;">

test/unit/course_test.rb

@@ -7,8 +7,8 @@ class CourseTest < ActiveSupport::TestCase
   end
 
   test 'name valid with CJK coding' do
-    course = Course.find_by_id(74)
     name_quirk = '电路与电子学基础（软件工程专业）'
+    course = Course.find_by_id(74)
     course.name = "test_course"
     assert course.valid?
     course.name = name_quirk
@@ -17,9 +17,9 @@ class CourseTest < ActiveSupport::TestCase
 
   test 'description too long must be valid.' do
     course = Course.find_by_id(8)
-    course.description = course.description * 100
+    course.description = 'a' * 2048 # description length validate.
     course.valid?
-    assert_equal course.errors.full_messages.count, 0
+    assert course.errors[:name].empty?
     assert course.valid?
   end