Merge branch 'develop' into 'develop'

竞赛发布通知字段过长400问题



See merge request !89

app/models/mailer.rb

@@ -850,7 +850,7 @@ class Mailer < ActionMailer::Base
     @token = token
     @url = url_for(:controller => 'account', :action => 'activate', :token => token.value)
     mail :to => token.user.mail,
-         :subject => l(:mail_subject)
+         :subject => "#{Setting.mail_subject}"
   end
 
   def test_email(user)

app/views/news/_contest_news.html.erb

@@ -25,8 +25,8 @@
     </div>
   </div>
   <% if contest && User.current.admin_of_contest?(@contest) %>
-      <%= labelled_form_for @news, :url => new_contest_news_path(:contest_id => @contest),
-                           :html => {:id => 'news-form', :nhname => 'form', :multipart => true, :method => "get"} do |f| %>
+      <%= labelled_form_for @news, :url => {:controller => 'news', :action => 'new',  :contest_id => @contest.id},
+                           :html => {:id => 'news-form', :nhname => 'form', :multipart => true} do |f| %>
           <%= render :partial => 'contest_news_new', :locals => {:f => f, :news => @news, :edit_mode => false, :contest => @contest} %>
       <% end %>
   <% end %>

config/routes.rb

@@ -563,6 +563,8 @@ RedmineApp::Application.routes.draw do
   get '/boards/:id/boards_topic', :to =>'boards#show', :as => 'boards_topic'
   match 'courses/:course_id/news/index', :to => 'news#index', :via => [:get, :post], :as => 'new_course_news'
   match 'courses/:course_id/news/new', :to => 'news#new', :via => [:get, :post]
+  match 'contests/:contest_id/news/index', :to => 'news#index', :via => [:get, :post], :as => 'new_contest_news'
+  match 'contests/:contest_id/news/new', :to => 'news#new', :via => [:get, :post]
   match 'users/:user_id/homepage/articles/:id', :to => 'article_homepages#show', :as => "user_homepage_show"
 
   match 'users/:id/courses', :to => 'users#course_community', :as => "user_course_community"