Project

General

Profile

« Previous | Next » 

Revision b729fb04

Added by Paul Kelly almost 14 years ago

  • ID b729fb042c3c82172050a0fe477c6ff9f2c2174d

Fixes #212 - Remove AS from facts

View differences:

app/views/common/_fact_selected.html.erb
<%= hidden_field_tag :via, @via %>
<span id=fact_search>
<%= label_tag "Fact Name" %>
<%= collection_select :search, :fact_values_fact_name_id_eq,
<%= label_tag :search_fact_name_id, "Fact Name" %>
<%= collection_select :search, "#{@via}fact_name_id_eq".to_sym,
Puppet::Rails::FactName.all(:select => "id, name", :order => "name ASC"),
:id, :name, :selected => @fact_name_id, :include_blank => "Select a fact"
:id, :name, {:selected => @fact_name_id, :include_blank => "Select a fact"},
{:id => :search_fact_name_id}
%>
<% if @fact_values -%>
<%= label :fact_values_value_eq, "Value" %>
<%= collection_select :search, :fact_values_value_eq, @fact_values, :value, :value %>
<% if @values -%>
<%= label "search_#{@via}value_eq", "Value" %>
<%= collection_select :search, "#{@via}value_eq".to_sym, @values, :value, :value %>
<% end -%>
</span>
<%= observe_field(:search_fact_values_fact_name_id_eq,
<%= observe_field(:search_fact_name_id,
:url => { :action => :fact_selected },
:update => :fact_search,
:with => :search_fact_values_fact_name_id_eq) %>
:with => "'search_fact_name_id=' + value + '&via=' + $F(\'via\')") %>

Also available in: Unified diff