foreman_ipam 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 525cdc684da2e1f4be01e09ece21a55e344ac04d993b8c637a064667abd3b0aa
-  data.tar.gz: 28d7e7bbb08f7d58faccf393fd1f604dd1c7066b95c2e178294757dfd34fe335
+  metadata.gz: 1893cec1fd30e76e4266da9c4a3c5f67feeb3f37d36bbee3770717084e22efee
+  data.tar.gz: 7ce09d767f39102bddfc6fd5edbfcc792c29e21351e16d4f62c69b2d673048b3
 SHA512:
-  metadata.gz: b11c50e3153dd419f03eacd46eb03b21ffc089947818f9f829c21dc8e91e279786ed82159fadf13950bb284a24bcd4e5d35d139be29b965842132650ffb60078
-  data.tar.gz: 8853c0617dc7bbcfc9c412d9de99ec966b343ae2783fe06f8b4ca9f117902a403bf4fc42275ab9b3c3ab58417d73a3676431c7d51e9afb1530fef3a68768dc47
+  metadata.gz: 7a26a7fd3e864c755b792efc25f9e173f7791e029bc5220bcaae1f01867145dfd12befd445618a11be8067dc254074262044408b682731452d070bc23742b027
+  data.tar.gz: e44c723f9cf5605e6eaaa5cda49d243db3e97b0c8fc925e1b68e24f61db1f260f25d87cc0eadfb109be50b4e98380f024a5a53da2eb71260df4468c53aedf544

data/app/controllers/foreman_ipam/dashboard_controller.rb

@@ -6,7 +6,7 @@ module ForemanIpam
     end
 
     def subnets
-      @subnets = Phpipam.proxy.get_subnets(params[:section_name])
+      @subnets = Phpipam.proxy.get_subnets_by_section(params[:section_name])
       render :json => @subnets.to_json, :status => :ok
     end
   end

data/app/views/foreman_ipam/dashboard/ipam.html.erb

@@ -1,6 +1,6 @@
 <h1>IPAM Integration Dashboard</h1>
 
-<% if @response && @response.length > 0 %>
+<% if @response['data'] && @response['data'].length > 0 %>
   <h2>phpIPAM</h2>
   <h3>Sections:</h3>
   <table class="<%= table_css_classes 'table-fixed' %>">
@@ -11,7 +11,7 @@
       </tr>
     </thead>
     <tbody>
-      <% @response.each do |section| %>
+      <% @response['data'].each do |section| %>
         <tr>
           <td class="ellipsis">
             <a onclick="getSubnets('<%= section['id'] %>', '<%= section['name'] %>')"><%= section['name'] %></a>
@@ -26,7 +26,7 @@
 <% else %>
   <div class="alert alert-warning ">
     <span class="pficon pficon-warning-triangle-o "></span>
-    <span class="text"><%= _("No sections found in the External IPAM instance.") %></span>
+    <span class="text"><%= _("No sections found in External IPAM.") %></span>
   </div>
 <% end %>
 
@@ -56,7 +56,7 @@
       <div class='col-md-6'><strong>Description</strong></strong></div><br />
     `;
 
-    subnets.forEach(function(item) {
+    subnets['data'].forEach(function(item) {
       subnet_container.innerHTML += `
         <div class='col-md-2'>` + item['subnet'] + `/` + item['mask'] + `</div>
         <div class='col-md-6'>` + item['description'] + `</div><br />

data/lib/foreman_ipam/version.rb

@@ -1,3 +1,3 @@
 module ForemanIpam
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ipam
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Christopher Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-27 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for IPAM integration with various IPAM providers
 email: