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

app/helpers/application_helper.rb

@@ -685,7 +685,7 @@ module ApplicationHelper
       when 2
         obj = args.shift
         attr = args.shift
-      text = obj.send(attr).html_safe.to_s
+        text = obj.send(attr).to_s
       else
         raise ArgumentError, 'invalid arguments to textilizable'
     end
@@ -727,7 +727,7 @@ module ApplicationHelper
       when 2
         obj = args.shift
         attr = args.shift
-        text = obj.send(attr).html_safe.to_s
+        text = obj.send(attr).to_s
       else
         raise ArgumentError, 'invalid arguments to textilizable'
     end
@@ -1831,4 +1831,5 @@ module ApplicationHelper
     content_tag(:ul, logos.join("").html_safe, :class => ul_class.to_s).html_safe
   end
 
+
 end

app/models/forum.rb

@@ -11,7 +11,7 @@ class Forum < ActiveRecord::Base
   'creator_id'
   validates_presence_of :name, :creator_id, :description
   validates_length_of :name, maximum: 50
-  validates_length_of :description, maximum: 255
+  #validates_length_of :description, maximum: 255
   validates :name, :uniqueness => true
   
   acts_as_taggable

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/memo.rb

@@ -8,7 +8,7 @@ class Memo < ActiveRecord::Base
 	# 若是主题帖，则内容可以是空
 	#validates :content, presence: true, if: Proc.new{|o| !o.parent_id.nil? }
 	validates_length_of :subject, maximum: 50
-	validates_length_of :content, maximum: 3072
+	#validates_length_of :content, maximum: 3072
 	validate :cannot_reply_to_locked_topic, :on => :create
 
 	acts_as_tree :counter_cache => :replies_count, :order => "#{Memo.table_name}.created_at ASC"

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/bids/_history.html.erb

@@ -5,7 +5,7 @@
 <div id='leave-message'>
 	<%= render :partial => 'new', :locals => {:bid => @bid, :sta => @state} %>
 </div>
-<% label = '';
+<% label = ''
   case @bid.reward_type
     when 1
       label = l(:label_respond_requirement)

app/views/bids/_new.html.erb

@@ -41,7 +41,7 @@
 <table border="0" width="525px" align="center">
 	<tr>
 		<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
-		<%= submit_tag l(:button_clear), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
+		<%= submit_tag l(:button_clear_meassge), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
 	</tr>
 </table>
 <!-- end -->

app/views/forums/new.html.erb

@@ -4,7 +4,7 @@
    @nav_dispaly_main_contest_label = 1 %>
 <% @nav_dispaly_forum_label = 1%>
 <!-- added by fq -->
-<h3><%= l :label_forum_new %></h1>
+<h1><%= l :label_forum_new %></h1>
 
 <%= render 'form' %>
 

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
@@ -1415,6 +1415,7 @@ zh:
  
   #fq
   button_leave_meassge: 留言
+  button_clear_meassge: 清除留言
   label_leave_message_to: 给用户 %{name}留言
   label_leave_message: 留言内容
   label_message: 留言板

db/migrate/20140814062455_change_forum_description.rb

@@ -0,0 +1,9 @@
+class ChangeForumDescription < ActiveRecord::Migration
+  def up
+    change_column :forums, :description, :text, default: nil
+  end
+
+  def down
+    change_column :forums, :description, :string, default: ''
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140812065417) do
+ActiveRecord::Schema.define(:version => 20140814062455) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -441,15 +441,15 @@ 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|
     t.string   "name",                        :null => false
-    t.string   "description",  :default => ""
+    t.text     "description"
     t.integer  "topic_count",  :default => 0
     t.integer  "memo_count",   :default => 0
     t.integer  "last_memo_id", :default => 0