foreman_xen 0.6.0 → 0.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/{compute_resources → foreman_xen}/xenserver/cache_refresh.js +0 -0
  3. data/app/assets/javascripts/{compute_resources → foreman_xen}/xenserver/populate_fields.js +0 -0
  4. data/app/models/foreman_xen/xenserver.rb +1 -1
  5. data/app/views/compute_resources_vms/form/xenserver/_base.html.erb +2 -2
  6. data/lib/foreman_xen/engine.rb +3 -3
  7. data/lib/foreman_xen/version.rb +1 -1
  8. data/test/test_helper.rb +2 -2
  9. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 38d3e12967ca3a203cf8eddc4fe6e21140a8c3e144106445caa4ad58537aba44
4
- data.tar.gz: 476f8f8724212ff5957dc0ef97db17e2dc429dc9ecbba13744294b61c2e859a4
3
+ metadata.gz: a768b8f50ae86ddbca9006df5a6e123c68aece8a4fa6c96df9151715f573afb7
4
+ data.tar.gz: 18e355d925f7eba0ec1694acc7fb0f7483b1b6cd382bb103d543578d7377e065
5
5
  SHA512:
6
- metadata.gz: 5ce56cbd64536a09f48107d62736fede701aded7459f4c75efacda2013a6990539b02d8df3e4d4073e47e00662da20e5e366cfad5098e8bf56704d482cfe126f
7
- data.tar.gz: c2dcc3d30d8367684f0300d0038ea4da13d6a681097b7711b128149d17ffc50cbdb095dd8d2bb8a17725e8a9efcc8ed113ef25e109c4b50d79cd4df7d906efd7
6
+ metadata.gz: ecbe4656e00f66a2481fb02b4048b5dce3da8056981b04d7aba390a782f1462a48e1f3e4c38c210bdd75c6e0b12cca2d51204ebeeba0799d0fe717d7fc8cecf7
7
+ data.tar.gz: cf688e43aaf39170f504e0a1f980ba087d506d9a2f3e4b75b0db748b536cad8d8487d59a596e7b7e6c8a150d197ab719986ab7387d5cdf9949fc306fa03c02b6
data/app/models/foreman_xen/xenserver.rb CHANGED
@@ -168,7 +168,7 @@ module ForemanXen
168
168
  end
169
169
  retval = []
170
170
  tmps.each do |snapshot|
171
- retval << snapshot if vm.snapshots.include?(snapshot.reference)
171
+ retval << snapshot if snapshot.snapshot_metadata.include?(vm.uuid)
172
172
  end
173
173
  retval
174
174
  end
data/app/views/compute_resources_vms/form/xenserver/_base.html.erb CHANGED
@@ -192,5 +192,5 @@
192
192
  })
193
193
  </script>
194
194
 
195
- <%= compute_specific_js(compute_resource, 'cache_refresh') %>
196
- <%= compute_specific_js(compute_resource, 'populate_fields') %>
195
+ <%= compute_specific_js(compute_resource, 'foreman_xen/cache_refresh') %>
196
+ <%= compute_specific_js(compute_resource, 'foreman_xen/populate_fields') %>
data/lib/foreman_xen/engine.rb CHANGED
@@ -9,7 +9,7 @@ module ForemanXen
9
9
  engine_name 'foreman_xen'
10
10
 
11
11
  initializer 'foreman_xen.register_gettext', :after => :load_config_initializers do |app|
12
- locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
12
+ locale_dir = File.join(File.expand_path('../..', __dir__), 'locale')
13
13
  locale_domain = 'foreman-xen'
14
14
 
15
15
  Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
@@ -43,8 +43,8 @@ module ForemanXen
43
43
  begin
44
44
  # extend fog xen server and image models.
45
45
  require 'fog/compute/xen_server/models/server'
46
- require File.expand_path('../../../app/models/concerns/fog_extensions/xenserver/server', __FILE__)
47
- require File.expand_path('../../../app/models/concerns/foreman_xen/host_helper_extensions', __FILE__)
46
+ require File.expand_path('../../app/models/concerns/fog_extensions/xenserver/server', __dir__)
47
+ require File.expand_path('../../app/models/concerns/foreman_xen/host_helper_extensions', __dir__)
48
48
 
49
49
  Fog::Compute::XenServer::Server.send(:include, ::FogExtensions::Xenserver::Server)
50
50
  ::HostsHelper.send(:include, ForemanXen::HostHelperExtensions)
data/lib/foreman_xen/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForemanXen
2
- VERSION = '0.6.0'.freeze
2
+ VERSION = '0.6.1'.freeze
3
3
  end
data/test/test_helper.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # Configure Rails Environment
2
2
  ENV['RAILS_ENV'] = 'test'
3
3
 
4
- require File.expand_path('../dummy/config/environment.rb', __FILE__)
4
+ require File.expand_path('dummy/config/environment.rb', __dir__)
5
5
  require 'rails/test_help'
6
6
 
7
7
  Rails.backtrace_cleaner.remove_silencers!
@@ -11,5 +11,5 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
11
11
 
12
12
  # Load fixtures from the engine
13
13
  if ActiveSupport::TestCase.method_defined?(:fixture_path=)
14
- ActiveSupport::TestCase.fixture_path = File.expand_path('../fixtures', __FILE__)
14
+ ActiveSupport::TestCase.fixture_path = File.expand_path('fixtures', __dir__)
15
15
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_xen
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Nemirovsky
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2018-05-04 00:00:00.000000000 Z
13
+ date: 2018-05-05 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: fog-xenserver
@@ -50,8 +50,8 @@ files:
50
50
  - LICENSE
51
51
  - README.md
52
52
  - Rakefile
53
- - app/assets/javascripts/compute_resources/xenserver/cache_refresh.js
54
- - app/assets/javascripts/compute_resources/xenserver/populate_fields.js
53
+ - app/assets/javascripts/foreman_xen/xenserver/cache_refresh.js
54
+ - app/assets/javascripts/foreman_xen/xenserver/populate_fields.js
55
55
  - app/controllers/foreman_xen/cache_controller.rb
56
56
  - app/controllers/foreman_xen/snapshots_controller.rb
57
57
  - app/helpers/xen_compute_helper.rb