Project

General

Profile

« Previous | Next » 

Revision fc9ba74f

Added by Robert Birnie over 11 years ago

  • ID fc9ba74f0225133c97c51dd0c277c1cf5b58466a

fix trend labels for ForemanTrends

View differences:

app/helpers/trends_helper.rb
def trend_title trend
if trend.fact_value.blank?
trend.type_name.camelcase
trend.to_label
else
"#{trend.type_name.camelcase} - #{trend.name}"
"#{trend.type_name} - #{trend.to_label}"
end
end
app/models/fact_trend.rb
end
def type_name
fact_name.blank? ? trendable.name : fact_name
if fact_value.blank?
name.blank? ? fact_name : name
else
fact_name
end
end
def create_values
app/views/trends/_trends.html.erb
<% group.each do |trend| -%>
<ul class="base">
<li>
<% opts = trend.name? ? trend.name : trend.fact_value %>
<table class="table table-condensed table-layout: fixed">
<tr>
<td style="width: 80%; border-top: none" >
<%= link_to opts, trend_path(:id => trend), :title => "Details" %>
<%= link_to trend.to_label, trend_path(:id => trend), :title => "Details" %>
</td>
<td style="width: 20%; border-top: none">
<% unless trend.trend_counters.blank? %><%= trend.trend_counters.last.count %><% end %>
app/views/trends/edit.html.erb
<%= javascript 'trends' %>
<% title "Edit Trend #{@trend.to_s.camelcase}" %>
<% title "Edit Trend #{@trend.to_label}" %>
<div class="span6">
<% form_tag trend_path, :method => :put do %>
<% if @trend.is_a?(FactTrend) %>
app/views/trends/index.html.erb
</tr>
<% @trends.each do |trend| %>
<tr>
<td><%= link_to trend.type_name.capitalize, trend_path(:id => trend), :title => "Show Trends" %></td>
<td><%= link_to trend.type_name, trend_path(:id => trend), :title => "Show Trends" %></td>
<td>
<%= action_buttons(
display_link_if_authorized("Edit", hash_for_edit_trend_path(:id => trend), :class => "btn"),
display_delete_if_authorized(hash_for_trend_path(:id => trend), :confirm => "Delete all the trend history for #{trend.type_name.capitalize}?")) %>
display_delete_if_authorized(hash_for_trend_path(:id => trend), :confirm => "Delete all the trend history for #{trend.type_name}?")) %>
</td>
</tr>
<% end %>
app/views/trends/show.html.erb
<%= trend_chart 'trend_graph', "#{trend_title(@trend)}", "last #{range} days", chart_data(@trend, range.days.ago) %>
<table class="table">
<% head = @hosts ? "Hosts" : "Values" %>
<th colspan="4"><%= head %></th>
<tr>
<% if @trend.fact_value == nil %>
<% if @trend.fact_value == nil %>
<th colspan="4">Values</th>
<tr>
<%= render 'trends' %>
<% else %>
</tr>
<% else %>
<th colspan="4">Hosts</th>
<tr>
<%= render 'hosts' %>
<% end %>
</tr>
</tr>
<% end %>
</table>

Also available in: Unified diff