foreman_virt_who_configure 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f67a089084c8f494463d27020a510a6141d32aa
-  data.tar.gz: 79cda417d8d80bcdedfe3a0709c2758d7c083d92
+  metadata.gz: 555249a1ed520837554c1f8802032999a22f4b0a
+  data.tar.gz: '069195e8ac45be12a1ba9e81a6275b7136890027'
 SHA512:
-  metadata.gz: 3ef1c22a5a6fc2dff642e15c293309ad0f04ede5d5e7f29fef0b2cf12563b4fe802c3288a7c6bd31d7d3abbcd49c403a5e8892a8490073d3ff1fe79249e14cd0
-  data.tar.gz: 37bba004933053195c22693a4b8d12220b7c8e751e6dadedf849749280352bc06a0774ba1df49838d80b378acdd3494b006ba87d3e95fe361fdcd3761191046d
+  metadata.gz: '098fdd4be89d11e006df34dce29781c5fbc2b95da9bc07970f44b107d0f3e2f56d1fe58a59d769ec29c8ea1450f7014d4956f2829a6cec5801570829282469d5'
+  data.tar.gz: 2ed13a393d1a829bcac562d659e0f752629af89589fe31220ec2d079b4d08c9037e8e071023bba05b538afc530d96358577cd33f91d0c7320b414758f36c505f

data/app/assets/javascripts/foreman_virt_who_configure/config_edit.js

@@ -1,4 +1,5 @@
 function virt_who_update_listing_mode() {
+  var hypervisor_type = $('#foreman_virt_who_configure_config_hypervisor_type').val();
   var filtering_mode = $('#foreman_virt_who_configure_config_listing_mode').val();
   var whitelist = $('#foreman_virt_who_configure_config_whitelist').parents('div.form-group');
   var blacklist = $('#foreman_virt_who_configure_config_blacklist').parents('div.form-group');
@@ -13,14 +14,14 @@ function virt_who_update_listing_mode() {
     blacklist_parent.hide();
   } else if (filtering_mode == '1') {
     whitelist.show();
-    whitelist_parent.show();
+    if (hypervisor_type == 'esx') { whitelist_parent.show(); } else { whitelist_parent.hide(); }
     blacklist.hide();
     blacklist_parent.hide();
   } else if (filtering_mode == '2') {
     whitelist.hide();
     whitelist_parent.hide();
     blacklist.show();
-    blacklist_parent.show();
+    if (hypervisor_type == 'esx') { blacklist_parent.show(); } else { blacklist_parent.hide(); }
   }
 }
 
@@ -32,6 +33,7 @@ function virt_who_update_hypervisor_fields() {
   element.closest('.form-group').toggle(selected_type != 'libvirt' && selected_type != 'kubevirt');
   var element = $('#foreman_virt_who_configure_config_kubeconfig_path');
   element.closest('.form-group').toggle(selected_type == 'kubevirt');
+  virt_who_update_listing_mode();
 }
 
 function virt_who_update_credentials_help() {

data/app/views/foreman_virt_who_configure/configs/show.html.erb

@@ -39,8 +39,14 @@
           <%= config_attribute :satellite_url, @config.satellite_url, _('Satellite server FQDN')%>
           <%= config_attribute :hypervisor_id, @config.hypervisor_id, _('Hypervisor ID') %>
           <%= config_attribute :listing_mode, _(ForemanVirtWhoConfigure::Config::FILTERING_MODES[@config.listing_mode.to_s]), _('Filtering') %>
-          <%= config_attribute :whitelist, @config.whitelist if @config.whitelist.present? %>
-          <%= config_attribute :blacklist, @config.blacklist if @config.blacklist.present? %>
+          <% if @config.listing_mode == ForemanVirtWhoConfigure::Config::WHITELIST %>
+            <%= config_attribute :whitelist, @config.whitelist, _('Filter Hosts') if @config.whitelist.present? %>
+            <%= config_attribute :filter_host_parents, @config.filter_host_parents if @config.filter_host_parents.present? %>
+          <% end %>
+          <% if @config.listing_mode == ForemanVirtWhoConfigure::Config::BLACKLIST %>
+            <%= config_attribute :blacklist, @config.blacklist, _('Exclude Hosts') if @config.blacklist.present? %>
+            <%= config_attribute :exclude_host_parents, @config.exclude_host_parents if @config.exclude_host_parents.present? %>
+          <% end %>
           <%= config_attribute :debug, checked_icon(@config.debug), _('Enable debugging output?') %>
           <%= config_attribute :proxy, @config.proxy if @config.proxy.present? %>
           <%= config_attribute :no_proxy, @config.no_proxy if @config.no_proxy.present? %>

data/lib/foreman_virt_who_configure/version.rb

@@ -1,3 +1,3 @@
 module ForemanVirtWhoConfigure
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Foreman virt-who-configure team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello