Merged r12912 and r12913 from trunk.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12921 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index dbc55cbd4003f080eebc4489e7c2e61bddf135da..de346c5769792c8fe114f85e1b06e5dd0edbcdaf 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -69,6 +69,7 @@ class IssuesController < ApplicationController
         @limit = Setting.feeds_limit.to_i
       when 'xml', 'json'
         @offset, @limit = api_offset_and_limit
+        @query.column_names = %w(author)
       else
         @limit = per_page_option
       end

diff --git a/app/models/issue.rb b/app/models/issue.rb
index b9a2b20a9c7f5c6266f8b13ebb3aacb4806fb249..2c2e9f087f82d5951397fa7627a006c2dd767312 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -200,7 +200,7 @@ class Issue < ActiveRecord::Base
 
   # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields
   def available_custom_fields
-    (project && tracker) ? (project.all_issue_custom_fields & tracker.custom_fields.all) : []
+    (project && tracker) ? (project.all_issue_custom_fields & tracker.custom_fields) : []
   end
 
   def visible_custom_field_values(user=nil)