foreman_discovery 1.0.0.rc3 → 1.0.0.rc4

data/app/controllers/discovers_controller.rb

@@ -8,6 +8,7 @@ class DiscoversController < ::ApplicationController
 
   before_filter :find_by_name, :only => %w[show edit update destroy refresh_facts convert]
   before_filter :find_multiple, :only => [:multiple_destroy, :submit_multiple_destroy]
+  before_filter :taxonomy_scope, :only => [:edit] 
 
   helper :hosts
 
@@ -180,4 +181,20 @@ class DiscoversController < ::ApplicationController
     ip = ip.split(',').first
   end
 
+  def taxonomy_scope
+    if params[:host]
+      @organization = Organization.find_by_id(params[:host][:organization_id])
+      @location = Location.find_by_id(params[:host][:location_id])
+    end
+
+    if SETTINGS[:organizations_enabled]
+      @organization ||= Organization.current
+      @organization ||= Organization.my_organizations.first
+    end
+    if SETTINGS[:locations_enabled]
+      @location ||= Location.current
+      @location ||= Location.my_locations.first
+    end
+  end
+
 end

data/app/models/host/discovered.rb

@@ -46,7 +46,7 @@ class Host::Discovered < ::Host::Base
     end
     h ||= Host.new :name => name, :type => "Host::Discovered"
     h.type = "Host::Discovered"
-    h.mac = values["macaddress_eth0"]
+    h.mac = values["macaddress_eth0"].downcase
 
     if SETTINGS[:locations_enabled]
       begin

data/lib/foreman_discovery/engine.rb

@@ -1,4 +1,3 @@
-require 'deface'
 require 'discovery_home_helper_patch'
 
 module ForemanDiscovery
@@ -9,7 +8,7 @@ module ForemanDiscovery
     # Load this before the Foreman config initizializers, so that the Setting.descendants
     # list includes the plugin STI setting class
     initializer 'foreman_discovery.load_default_settings', :before => :load_config_initializers do |app|
-      require_dependency File.expand_path("../../../app/models/setting/discovered.rb", __FILE__)
+      require_dependency File.expand_path("../../../app/models/setting/discovered.rb", __FILE__) if (Setting.table_exists? rescue(false))
     end
 
     initializer 'foreman_discovery.helper' do |app|

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "1.0.0.rc3"
+  VERSION = "1.0.0.rc4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +68,6 @@ extra_rdoc_files:
 - README.md
 files:
 - app/helpers/discovers_helper.rb
-- app/overrides/add_build_flag.rb
 - app/models/setting/discovered.rb
 - app/models/host/managed_extensions.rb
 - app/models/host/discovered.rb

data/app/overrides/add_build_flag.rb

@@ -1,4 +0,0 @@
-Deface::Override.new(:virtual_path => "hosts/_operating_system", 
-                     :name => "add_build_flag",
-                     :insert_after => "span[id='os_select']",
-                     :text => "\n<% if request.fullpath =~ /^\\/discovers/ -%><%= f.hidden_field :build, :value => true %><% end -%>")