staypuft 0.4.6 → 0.4.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjg1MTI2NjJmZTBiYWRjYmM2MjBjM2U3MDNhZjEzZjFmYTI4MjBjYw==
+    MDMxMmJlMWYzNTNkM2ZiZDdlZjQ3ODllNjAxNTYxOTM2OWU0ZDRlNA==
   data.tar.gz: !binary |-
-    NTI5ZmJlODZlNDI5ZWUxOGIwNjJjM2Y5YzRkNzM4ZGFjOTEyYTNlOQ==
+    NzQ4ZmMzNmMzMGM0NTZmMWZmZDNhNTE4NWNkNTJmZmI0MmZkM2FmNg==
 SHA512:
   metadata.gz: !binary |-
-    NmVjNTRlNmNhY2Q4NjI0OThkNGZmZmY4OTllMTNjNTlhNzJjNzBiNDNmNGY2
-    YTA0Y2NkNmJhMmJlMTZiNGI4NTYzYjNkOGZkNDg2ODFmNjM0ZGZjNTRhOTBj
-    YTFiM2YyZTI0ZjBjM2FlZmMxM2VkZTgyODU1ODNmMGIwMzRlNDQ=
+    N2E4MGMxMjY4N2ViMjc3NzBkYWM1ZTJkYmY0N2Q4ODQ1YjM1MTc4ZTcxZmE3
+    ZWQzOGRmOTgzZmQ5YjhmM2ZlOTc2NWM4NDhjMzE5ODg2MTI0MTk3NTU5MTVl
+    MGIyYzcyMzY5ODk0ZDMzMmViMWEzYzI3NTM3Y2NjZWE4ODk4ZTc=
   data.tar.gz: !binary |-
-    YjA5MTExY2QyZjUxMGY0Mjk4ZWNmZWQ2MDUxODhkZGU4YmU3YzJjNTE1NTVj
-    N2RlY2NiZDc1MmZkMDQ4NTFjNTI3ZDcwZGYzNTZmM2YzZmJhNDU5NjA4MGVh
-    MTFiNjAzZGFjZmU2MTgxNzIxNmI2M2E4YWU4ZWY2ZGE5ODkxZmY=
+    NDQwYTczZmI5NDI5M2Q5NmM1MWZlODk3Njc2YmVhMGU4MzgzM2Y1MTVkM2U1
+    NTZjNDE0NmY0MGM0NTE5YmIyYmI3MWMwNTVmOWYxODVlOGRlZmE3MTJjNDAy
+    NmNhYWZkMGQxZjM2MTNkNTU5MTMxMzdjNjkwZGM5MDhjYzc2MWU=

data/app/controllers/staypuft/concerns/hosts_api_extensions.rb

@@ -2,16 +2,18 @@ module Staypuft::Concerns::HostsApiExtensions
   extend ActiveSupport::Concern
 
   included do
-    prepend_before_filter :check_openstack_hostgroup, only: [:create, :update]
+    before_filter :check_openstack_hostgroup, only: [:create, :update]
   end
 
   def check_openstack_hostgroup
     if params[:host] and params[:host][:hostgroup_id]
       hostgroup_id = params[:host][:hostgroup_id]
       hg = Hostgroup.find(hostgroup_id)
-      if hg.ancestors.include? Hostgroup.get_base_hostgroup
-        Rails.logger.error "Cannot set a deployment hostgroup directly."
-        render :json => {:error => {:message => _('Cannot set a deployment hostgroup directly.') } }, :status => :forbidden
+      unless @host.deployment and @host.hostgroup == hg
+        if hg.ancestors.include? Hostgroup.get_base_hostgroup
+          Rails.logger.error "Cannot set a deployment hostgroup directly."
+          render :json => {:error => _('Cannot set a deployment hostgroup directly.') }, :status => :forbidden
+        end
       end
     end
   end

data/app/controllers/staypuft/concerns/hosts_controller_extensions.rb

@@ -9,10 +9,13 @@ module Staypuft::Concerns::HostsControllerExtensions
   def check_openstack_hostgroup
     if params[:host] and params[:host][:hostgroup_id]
       hostgroup_id = params[:host][:hostgroup_id]
-      if openstack_hostgroup? hostgroup_id
-        Rails.logger.error "Cannot set a deployment hostgroup directly."
-        error _('Invalid host group selected! Cannot select OpenStack deployment host group.')
-        render :action => :edit and return
+      hostgroup = Hostgroup.find(hostgroup_id)
+      unless hostgroup.deployment and @host.hostgroup == hostgroup
+        if openstack_hostgroup? hostgroup_id
+          Rails.logger.error "Cannot set a deployment hostgroup directly."
+          error _('Invalid host group selected! Cannot select OpenStack deployment host group.')
+          render :action => :edit and return
+        end
       end
     end
   end

data/app/controllers/staypuft/interface_assignments_controller.rb

@@ -23,6 +23,7 @@ module Staypuft
 
       if errors.present?
         flash[:error] = errors.map{ |k, v| "#{k}: #{v}" }.join('<br />')
+        render :js => "$('#configure_networks_modal').modal('hide'); window.location = '#{deployment_path(@deployment)}'"
       end
     end
 

data/app/overrides/foreman_hosts_edit.rb

@@ -28,7 +28,8 @@ Deface::Override.new(:virtual_path => "hosts/_form",
                      :replace => "#{erb_tag}:contains(':hostgroup_id')",
                      :original => '04903c858c6f96ed5c015cac5960e02708d8fea8'
                      ) do
-"       <%=  select_f f, :hostgroup_id, accessible_hostgroups.reject { |hg| hg.to_label =~ /\#{Setting[:base_hostgroup]}\\/.*/ }, :id, :to_label,
+"       <% hostgroups = accessible_hostgroups.reject { |hg| hg.to_label =~ /\#{Setting[:base_hostgroup]}\\/.*/ && hg.to_label != @host.hostgroup.to_label } %>
+        <%=  select_f f, :hostgroup_id, hostgroups, :id, :to_label,
           { :include_blank => true},
           { :onchange => 'hostgroup_changed(this);', :'data-host-id' => @host.id,
             :'data-url' => (@host.new_record? || @host.type_changed?) ? process_hostgroup_hosts_path : hostgroup_or_environment_selected_hosts_path,

data/app/overrides/select_multiple_systems_hostgroup.rb

@@ -10,6 +10,7 @@ Deface::Override.new(:virtual_path => "hosts/select_multiple_hostgroup",
                      :replace => "#{erb_tag}:contains(':id')",
                      :original => '<%= selectable_f f, :id, [[_("Select host group"),"disabled"],[_("*Clear host group*"), "" ]] + Hostgroup.all.map{|h| [h.to_label, h.id]}.sort,{}, :onchange => "toggle_multiple_ok_button(this)" %>'
                      ) do
-"  <%= selectable_f f, :id, [[_(\"Select host group\"),\"disabled\"],[_(\"*Clear host group*\"), \"\" ]] + Hostgroup.all.reject{ |hg| hg.to_label =~ /\#{Setting[:base_hostgroup]}\\/.*/ }.map{|h| [h.to_label, h.id]}.sort,{},
+"   <% hostgroups = accessible_hostgroups.reject { |hg| hg.to_label =~ /\#{Setting[:base_hostgroup]}\\/.*/ } %>
+    <%= selectable_f f, :id, [[_(\"Select host group\"),\"disabled\"],[_(\"*Clear host group*\"), \"\" ]] + hostgroups.map{|h| [h.to_label, h.id]}.sort,{},
         :onchange => \"toggle_multiple_ok_button(this)\" %>"
 end

data/app/views/staypuft/interface_assignments/_nics_assignment.html.erb

@@ -5,7 +5,7 @@
       <div class="panel-body">
         <% @subnets.each do |subnet| %>
           <% next if is_pxe?(@deployment, subnet) # we skip PXE network which is always on primary interface %>
-          <% next if @host.interfaces.vip.where(:subnet_id => subnet.id).present? # we skip assigned subnets %>
+          <% next if @host.interfaces.non_vip.where(:subnet_id => subnet.id).present? # we skip assigned subnets %>
           <%= render 'staypuft/subnets/subnet_pull',
                      :subnet => subnet,
                      :deployment => @deployment,

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks