Project

General

Profile

« Previous | Next » 

Revision 54134869

Added by Ohad Levy over 11 years ago

  • ID 541348691a62cbe50fcbd2b627771192c8f8c863

refs #2254 - minor fixes related to host form

View differences:

app/helpers/hosts_and_hostgroups_helper.rb
end
def parent_classes obj
return obj.hostgroup.classes if obj.is_a?(Host) and obj.hostgroup
return obj.hostgroup.classes if obj.kind_of?(Host::Base) and obj.hostgroup
return obj.is_root? ? [] : obj.parent.classes if obj.is_a?(Hostgroup)
[]
end
app/helpers/hosts_helper.rb
end
def selected? host
return false if host.nil? or not host.is_a?(Host) or session[:selected].nil?
return false if host.nil? or not host.kind_of?(Host::Base) or session[:selected].nil?
session[:selected].include?(host.id.to_s)
end
app/models/host/managed.rb
owner.id_and_type if owner
end
def self.model_name
ActiveModel::Name.new(Host)
end
# virtual attributes which sets the owner based on the user selection
# supports a simple user, or a usergroup
# selection parameter is expected to be an ActiveRecord id_and_type method (see Foreman's AR extentions).
......
@tax_organization ||= TaxHost.new(organization, self)
end
def self.model_name
ActiveModel::Name.new(Host)
end
end
app/models/orchestration/dhcp.rb
return true if ((old.ip != ip) or (old.name != name) or (old.mac != mac) or (old.subnet != subnet))
# Handle jumpstart
#TODO, abstract this way once interfaces are fully used
if self.is_a?(Host) and jumpstart?
if self.kind_of?(Host::Base) and jumpstart?
if !old.build? or (old.medium != medium or old.arch != arch) or
(os and old.os and (old.os.name != os.name or old.os != os))
return true
app/views/puppetclasses/_class_selection.html.erb
<div class="span3 classes">
<h3>Included Classes</h3>
<%# hidden field to ensure that classes gets removed if none are defined -%>
<%= hidden_field_tag obj.class.to_s.downcase + "[puppetclass_ids][]" %>
<%= hidden_field_tag obj.class.model_name.downcase + "[puppetclass_ids][]" %>
<ul id="selected_classes">
<% if authorized_for(:host_editing, :edit_classes) -%>
<%= render :partial => "puppetclasses/selectedClasses",
:collection => obj.puppetclasses ,:as => :klass,
:locals => { :type => obj.class.to_s.downcase, :host => obj } %>
:locals => { :type => obj.class.model_name.downcase, :host => obj } %>
<% else -%>
<% obj.puppetclasses.each do |klass| %>
<li data-original-title="Not authorized to edit classes" rel="twipsy" style='color:black;'><%= h klass.name %></li>
......
:puppetclasses => (obj.environment.blank? ? Puppetclass.all : obj.environment.puppetclasses),
:selected_puppet_classes => obj.all_puppetclasses,
:obj => obj,
:type => obj.class.to_s.downcase
:type => obj.class.model_name.downcase
%>
</div>
</div>

Also available in: Unified diff