diff --git a/app/models/issue.rb b/app/models/issue.rb index 4c5e77cb5..f47e1c6f9 100644 --- a/app/models/issue.rb +++ b/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 diff --git a/app/models/news.rb b/app/models/news.rb index 860dd0baa..4f8601796 100644 --- a/app/models/news.rb +++ b/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 diff --git a/app/models/open_source_project.rb b/app/models/open_source_project.rb index 4a657edb4..0adc0957f 100644 --- a/app/models/open_source_project.rb +++ b/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) diff --git a/app/models/project.rb b/app/models/project.rb index 6c453baa9..5bcd2e8c5 100644 --- a/app/models/project.rb +++ b/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 diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb index 7818f5fb3..ab619e8ae 100644 --- a/app/views/contests/show_attendingcontest.html.erb +++ b/app/views/contests/show_attendingcontest.html.erb @@ -87,83 +87,72 @@
@@ -298,9 +287,9 @@ <%= l(:label_attendingcontest_spoksman) %> <% unless c_softapplication.nil? || c_softapplication.softapplication.nil? || c_softapplication.softapplication.user.nil? %> - ：<%= link_to c_softapplication.softapplication.user.name,user_path(c_softapplication.softapplication.user) %> + ：<%= link_to c_softapplication.softapplication.user.name,user_path(c_softapplication.softapplication.user) %> <% end %> -
+
diff --git a/test/unit/course_test.rb b/test/unit/course_test.rb index a29501066..86963eb4b 100644 --- a/test/unit/course_test.rb +++ b/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