From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 23 Feb 2014 08:14:59 +0000 (+0000)
Subject: Merged r12912 and r12913 from trunk.
X-Git-Tag: 2.5.0~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=066e9b7f94e5cb91912dd5468099da0925eb1dbf;p=redmine.git

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 dbc55cbd4..de346c576 100644
--- 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 b9a2b20a9..2c2e9f087 100644
--- 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)