Revision 5d7016fd
Added by Daniel Lobato Garcia over 8 years ago
app/helpers/containers_helper.rb | ||
---|---|---|
63 | 63 |
"https://registry.hub.docker.com/u/#{image['name']}" |
64 | 64 |
end |
65 | 65 |
end |
66 |
|
|
67 |
# Compatibility fixes - to be removed once 1.7 compatibility is no longer required |
|
68 |
if SETTINGS[:version].to_s.to_f <= 1.7 |
|
69 |
def trunc_with_tooltip(text, length = 32) |
|
70 |
trunc(text, length) |
|
71 |
end |
|
72 |
end |
|
66 | 73 |
end |
app/models/foreman_docker/taxonomy_extensions.rb | ||
---|---|---|
1 |
module ForemanDocker |
|
2 |
module TaxonomyExtensions |
|
3 |
extend ActiveSupport::Concern |
|
4 |
|
|
5 |
included do |
|
6 |
if SETTINGS[:version].to_s.to_f <= 1.7 |
|
7 |
def self.enabled_taxonomies |
|
8 |
%w(locations organizations).select { |taxonomy| SETTINGS["#{taxonomy}_enabled".to_sym] } |
|
9 |
end |
|
10 |
end |
|
11 |
end |
|
12 |
end |
|
13 |
end |
|
14 |
# To be removed after 1.7 compatibility is no longer required |
lib/foreman_docker/engine.rb | ||
---|---|---|
82 | 82 |
rake_tasks do |
83 | 83 |
load "#{ForemanDocker::Engine.root}/lib/foreman_docker/tasks/test.rake" |
84 | 84 |
end |
85 |
end |
|
86 | 85 |
|
87 |
# extend fog docker server and image models. |
|
88 |
require 'fog/fogdocker/models/compute/server' |
|
89 |
require 'fog/fogdocker/models/compute/image' |
|
90 |
require File.expand_path('../../../app/models/concerns/fog_extensions/fogdocker/server', __FILE__) |
|
91 |
require File.expand_path('../../../app/models/concerns/fog_extensions/fogdocker/image', __FILE__) |
|
92 |
Fog::Compute::Fogdocker::Server.send(:include, ::FogExtensions::Fogdocker::Server) |
|
93 |
Fog::Compute::Fogdocker::Image.send(:include, ::FogExtensions::Fogdocker::Image) |
|
86 |
require 'fog/fogdocker/models/compute/server' |
|
87 |
require 'fog/fogdocker/models/compute/image' |
|
88 |
require File.expand_path('../../../app/models/concerns/fog_extensions/fogdocker/server', |
|
89 |
__FILE__) |
|
90 |
require File.expand_path('../../../app/models/concerns/fog_extensions/fogdocker/image', |
|
91 |
__FILE__) |
|
92 |
config.to_prepare do |
|
93 |
Fog::Compute::Fogdocker::Server.send(:include, ::FogExtensions::Fogdocker::Server) |
|
94 |
Fog::Compute::Fogdocker::Image.send(:include, ::FogExtensions::Fogdocker::Image) |
|
95 |
::Taxonomy.send(:include, ForemanDocker::TaxonomyExtensions) |
|
96 |
end |
|
97 |
end |
|
94 | 98 |
end |
Also available in: Unified diff
Fixes #9177 - 1.7 compatibility fixes