Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
cxt 2017-02-06 11:18:52 +08:00
commit 756774f6ba
1 changed files with 2 additions and 2 deletions

View File

@ -191,7 +191,7 @@ class UsersController < ApplicationController
respond_to do |format|
format.html{render :layout => 'static_base'}
format.xls{
filename = "我发布的_#{l(:label_issue_list_xls)}.xls"
filename = "我发布的#{l(:label_issue_list_xls)}.xls"
send_data(issue_list_xls(@excel_issues), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename))
}
format.api
@ -237,7 +237,7 @@ class UsersController < ApplicationController
respond_to do |format|
format.html{render :layout => 'static_base'}
format.xls{
filename = "我收到的Issue#{l(:label_issue_list_xls)}.xls"
filename = "我收到的#{l(:label_issue_list_xls)}.xls"
send_data(issue_list_xls(@excel_issues), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename))
}
format.api