#1294

1.修改缺陷列表中缺陷描述样式
2.修改缺陷、日历查询时，Closed->关闭于，角色成员减少学生、老师、助教等3个角色

app/helpers/application_helper.rb

@@ -1831,4 +1831,5 @@ module ApplicationHelper
     content_tag(:ul, logos.join("").html_safe, :class => ul_class.to_s).html_safe
   end
 
+
 end

app/models/issue_query.rb

@@ -132,7 +132,7 @@ class IssueQuery < Query
       :type => :list_optional, :values => group_values
     ) unless group_values.empty?
 
-    role_values = Role.givable.collect {|r| [r.name, r.id.to_s] }
+    role_values = Role.project_role.collect {|r| [r.name, r.id.to_s] }
     add_available_filter("assigned_to_role",
       :type => :list_optional, :values => role_values
     ) unless role_values.empty?

app/models/role.rb

@@ -67,6 +67,16 @@ class Role < ActiveRecord::Base
     :in => ISSUES_VISIBILITY_OPTIONS.collect(&:first),
     :if => lambda {|role| role.respond_to?(:issues_visibility)}
 
+  #获取项目相关角色
+  def self.project_role
+    self.givable[0..2]
+  end
+
+  #获取课程相关角色
+  def self.course_role
+    self.givable[3..5]
+  end
+
   # Copies attributes from another role, arg can be an id or a Role
   def copy_from(arg, options={})
     return unless arg.present?

app/views/issues/_list.html.erb

@@ -39,7 +39,7 @@
 				<ul class="list-group-item-meta">
 					<div class="issue-list-description">
                       <div class="wiki">
-                        <%= textilizable issue, :description %>
+                        <p style="word-break:break-all;width: 100%;"><%= textAreailizable issue, :description %></p>
                       </div>
 						<!-- <#%= l(:field_description)%>:&nbsp;<#%= issue.short_description %> -->
 					</div>

config/locales/zh.yml

@@ -1334,7 +1334,7 @@ zh:
   label_gantt_progress_line: Progress line
   setting_jsonp_enabled: Enable JSONP support
   field_inherit_members: Inherit members
-  field_closed_on: Closed
+  field_closed_on: 已关闭
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: 合计
   label_create_time: 创建时间                     #Customer added！Added by nie

db/schema.rb

@@ -441,10 +441,10 @@ ActiveRecord::Schema.define(:version => 20140812065417) do
     t.datetime "created_at",                    :null => false
     t.datetime "updated_at",                    :null => false
     t.integer  "sort_type"
-    t.integer  "image_width",  :default => 107
-    t.integer  "image_height", :default => 63
     t.integer  "show_course",  :default => 1
     t.integer  "show_contest", :default => 1
+    t.integer  "image_width",  :default => 107
+    t.integer  "image_height", :default => 63
   end
 
   create_table "forums", :force => true do |t|