diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e449061f7..76808a392 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -701,7 +701,7 @@ class ApplicationController < ActionController::Base sheet1[count_row,2] = issue.subject sheet1[count_row,3] = issue.description sheet1[count_row,4] = issue_status_change(issue.status_id) - sheet1[count_row,5] = issue.assigned_to.show_name + sheet1[count_row,5] = issue.assigned_to.try(:show_name) sheet1[count_row,6] = issue_priority_change(issue.priority_id) sheet1[count_row,7] = issue.author.show_name sheet1[count_row,8] = issue.created_on diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 820b1d7ac..bdcef99c2 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -86,11 +86,7 @@ class IssuesController < ApplicationController # @issue_pages = Paginator.new @issue_count, @limit, params['page'] # params[:page] = (params[:page] || 1).to_i + 1 #页码需要加1 # @offset ||= @issue_pages.offset - @issues_filter = @query.issues - # (:include => [:assigned_to, :tracker, :priority, :category, :fixed_version], - # :order => 'issues.updated_on desc', - # :offset => @offset, - # :limit => @limit) + @issues_filter = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version], :order => 'issues.updated_on desc') @limit = 10 @is_remote = true @issue_pages = Paginator.new @issue_count, @limit, params['page'] || 1 @@ -109,7 +105,7 @@ class IssuesController < ApplicationController format.csv { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') } format.pdf { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'issues.pdf') } format.xls {filename = "#{@project.name.to_s}_#{l(:label_issue_list_xls)}.xls" - send_data(issue_list_xls(@issues), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename)) + send_data(issue_list_xls(@issues_filter), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename)) } end else diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d3b28fb20..92e96e84c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1799,7 +1799,7 @@ module ApplicationHelper end def link_to_function(name, function, html_options={}) - content_tag(:a, name, {:href => '#', :onclick => "#{function}; return false;"}.merge(:class => " c_purple")) + content_tag(:a, name, {:href => '#', :onclick => "#{function}; return false;"}.merge(:class => "BlueCirBtnMini ml10",:style => "display:inline-block; height:20px; line-height:20px;")) end # Helper to render JSON in views diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb index b6b91eed0..0790b73f4 100644 --- a/app/views/gantts/show.html.erb +++ b/app/views/gantts/show.html.erb @@ -22,7 +22,7 @@
<%= l(:label_related_issues) %> -