##// END OF EJS Templates
Merged r12912 and r12913 from trunk....
Jean-Philippe Lang -
r12646:066e9b7f94e5
parent child
Show More
@@ -69,6 +69,7 class IssuesController < ApplicationController
69 @limit = Setting.feeds_limit.to_i
69 @limit = Setting.feeds_limit.to_i
70 when 'xml', 'json'
70 when 'xml', 'json'
71 @offset, @limit = api_offset_and_limit
71 @offset, @limit = api_offset_and_limit
72 @query.column_names = %w(author)
72 else
73 else
73 @limit = per_page_option
74 @limit = per_page_option
74 end
75 end
@@ -200,7 +200,7 class Issue < ActiveRecord::Base
200
200
201 # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields
201 # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields
202 def available_custom_fields
202 def available_custom_fields
203 (project && tracker) ? (project.all_issue_custom_fields & tracker.custom_fields.all) : []
203 (project && tracker) ? (project.all_issue_custom_fields & tracker.custom_fields) : []
204 end
204 end
205
205
206 def visible_custom_field_values(user=nil)
206 def visible_custom_field_values(user=nil)
General Comments 0
You need to be logged in to leave comments. Login now