kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged r12912 and r12913 from trunk.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12921 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2014-02-23 08:14:59 +00:00
parent 805debddd0
commit 066e9b7f94
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/issues_controller.rb
View File

@ -69,6 +69,7 @@ class IssuesController < ApplicationController
@limit = Setting.feeds_limit.to_i @limit = Setting.feeds_limit.to_i
when 'xml', 'json' when 'xml', 'json'
@offset, @limit = api_offset_and_limit @offset, @limit = api_offset_and_limit
@query.column_names = %w(author)
else else
@limit = per_page_option @limit = per_page_option
end end

2
app/models/issue.rb
View File

@ -200,7 +200,7 @@ class Issue < ActiveRecord::Base
# Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields
def 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 end
def visible_custom_field_values(user=nil) def visible_custom_field_values(user=nil)