foreman_azure 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ea76c38a3b8a43fb02dc75f6151da9c33a9e44a
-  data.tar.gz: d36db15142dd1e3f71ec94731c83fbc157a47dce
+  metadata.gz: c423d706f2ee1849a1524d2cfac17f3b5e0576ab
+  data.tar.gz: 1f5145596fe51e1958da017b64b9cc99f4ddc75a
 SHA512:
-  metadata.gz: 50deb54b6d1dc4358d8f355555b53f31201d4402e0ec21e770ed66a20b1272c5cffb628b3f227a28d283f28b09e835255d0b8dc27f52f900927645f05a55591a
-  data.tar.gz: 9c1f72740bbe9a7aca370a97d393cc05d6e61e658b9422fd778809032e907c038f248996d67623bc6ef9322c569404a45ee3281391e92536459d7cf6f0378e13
+  metadata.gz: 8542d5a51b205fb7b0ff9824e35885c8992e9bf74aed80612574c1e039a00ce32a4decce4d68418e24a73a7e15dff3a0cc49c6aa445805629751728dcc7fc509
+  data.tar.gz: b6828bed9fef643e5e454b1c1c71240504e527cba638c651bc9f28ba3dbda453cec44920e904b266c02e82a0bf894bd3cbfa8af68dad3a85df8e670f3aa846f8

data/app/assets/javascripts/foreman_azure/host_os_azure_selected.js

@@ -3,7 +3,12 @@ function azure_image_selected() {
   var imageId = $('#host_compute_attributes_image_id').val();
   var azure_locations = $('#azure_locations');
   var locations_spinner = $('#azure_locations_spinner');
-  tfm.tools.showSpinner();
+  if (typeof tfm == 'undefined') {  // earlier than 1.13
+    foreman.tools.showSpinner();
+  } else {
+    tfm.tools.showSpinner();
+  }
+
   locations_spinner.removeClass('hide');
   $.ajax({
     data: { "image_id": imageId },
@@ -12,7 +17,11 @@ function azure_image_selected() {
     complete: function(){
       reloadOnAjaxComplete('#host_compute_attributes_image_id');
       locations_spinner.addClass('hide');
-      tfm.tools.hideSpinner();
+      if (typeof tfm == 'undefined') {  // earlier than 1.13
+        foreman.tools.hideSpinner();
+      } else {
+        tfm.tools.hideSpinner();
+      }
     },
     error: function(request, status, error) {
     },

data/app/models/foreman_azure/azure.rb

@@ -2,6 +2,9 @@ module ForemanAzure
   class Azure < ComputeResource
     alias_attribute :subscription_id, :user
     alias_attribute :certificate_path, :url
+    if ::Foreman::Version.new.major.to_i == 1 && ::Foreman::Version.new.minor.to_i <= 13
+      attr_accessible :subscription_id, :certificate_path
+    end
 
     before_create :test_connection
 

data/lib/foreman_azure/engine.rb

@@ -6,9 +6,12 @@ module ForemanAzure
 
     initializer 'foreman_azure.register_plugin', :before => :finisher_hook do
       Foreman::Plugin.register :foreman_azure do
-        requires_foreman '>= 1.8'
+        requires_foreman '>= 1.11'
         compute_resource(Azure)
-        parameter_filter(ComputeResource, :subscription_id, :certificate_path)
+        foreman_version = ::Foreman::Version.new
+        if foreman_version.major.to_i == 1 && foreman_version.minor.to_i >= 13
+          parameter_filter(ComputeResource, :subscription_id, :certificate_path)
+        end
       end
     end
 

data/lib/foreman_azure/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzure
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_azure
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia