Revision cd5947ee
Added by Robert Birnie over 11 years ago
- ID cd5947ee06049eb17da5379b25e9710b65beeb09
| app/helpers/trends_helper.rb | ||
|---|---|---|
|
def trend_days_filter
|
||
|
form_tag @trend, :id => 'days_filter', :method => :get, :class=>"form form-inline" do
|
||
|
content_tag(:span, "Trend of the last ") +
|
||
|
select(nil, 'range', 1..30, {:selected => range}, {:class=>"span1", :onchange =>"$('#days_filter').submit();$(this).disabled();"}) +
|
||
|
select(nil, 'range', 1..Setting.max_trend, {:selected => range}, {:class=>"span1", :onchange =>"$('#days_filter').submit();$(this).disabled();"}) +
|
||
|
content_tag(:span, " days.")
|
||
|
end
|
||
|
end
|
||
| ... | ... | |
|
end
|
||
|
end
|
||
|
|
||
|
def chart_data trend, from = 30.day.ago, to = Time.now
|
||
|
def chart_data trend, from = Setting.max_trend, to = Time.now
|
||
|
values = trend.values
|
||
|
labels = {}
|
||
|
values.includes(:trendable).each {|v| labels[v.id] = v.to_label}
|
||
| ... | ... | |
|
end
|
||
|
|
||
|
def range
|
||
|
params["range"].empty? ? 30 : params["range"].to_i
|
||
|
params["range"].empty? ? Setting.max_trend : params["range"].to_i
|
||
|
end
|
||
|
|
||
|
end
|
||
| app/models/setting.rb | ||
|---|---|---|
|
|
||
|
TYPES= %w{ integer boolean hash array }
|
||
|
FROZEN_ATTRS = %w{ name default description category settings_type }
|
||
|
NONZERO_ATTRS = %w{ puppet_interval idle_timeout entries_per_page }
|
||
|
NONZERO_ATTRS = %w{ puppet_interval idle_timeout entries_per_page max_trend }
|
||
|
validates_presence_of :name, :description
|
||
|
validates_presence_of :default, :unless => Proc.new { |s| !s.default } # broken validator
|
||
|
validates_uniqueness_of :name
|
||
| lib/foreman/default_settings/loader.rb | ||
|---|---|---|
|
set('authorize_login_delegation',"Authorize login delegation with REMOTE_USER environment variable",false),
|
||
|
set('authorize_login_delegation_api',"Authorize login delegation with REMOTE_USER environment variable for API calls too",false),
|
||
|
set('idle_timeout',"Log out idle users after a certain number of minutes",60),
|
||
|
set('max_trend',"Max days for Trends graphs",30)
|
||
|
].each { |s| create s.update(:category => "General")}
|
||
|
|
||
|
[
|
||
Also available in: Unified diff
fixes #2062 - Add max_trends setting