foreman_scc_manager 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0a839f167e9297e51379e38f984ab7616df52a6
-  data.tar.gz: a11cf8558d2cea9c44485a09095c7049d5c9267a
+  metadata.gz: d296a7acbef13daa1e12d2f5fd87cde248487a46
+  data.tar.gz: 8d3377991fc0dded2f0b4e72498bbc90081d6ea8
 SHA512:
-  metadata.gz: 456b05429cf1acdad480f499f8a001d8133125b1e14b64d92564d8c79ffb3ebdff7ce0cb8294e082563d0c0fd465639320a711384559a1618960e6d4e8fc0b09
-  data.tar.gz: 504fc281da2f0cd519bc5e67e1735dcb1393b6079f76895ad50086813a4412a1406aae0d5778845fb640c475c34ae1444efa83ca8d53d7039629628450b5fba6
+  metadata.gz: 5c94a4f70faeab6138a5d3a41e65d5ea59e17cdea4c5df585ff402bc8118ba01ee9a51783d2213bc287534700ef9a430955b3a18016ebd53f61ffcdd23d24603
+  data.tar.gz: 91b77311d51017259a86f688b9de1491f00603d6cb8e932c2fc1b642be6c698c147a1cfb90611b3d80fc8fcd928eb4002fb7c017b13f1ffb6f5d03ccaa2172e1

data/app/models/scc_account.rb

@@ -91,7 +91,11 @@ class SccAccount < ActiveRecord::Base
       # rewire product to product relationships
       upstream_products.each do |up|
         extensions = scc_products.where(scc_id: up['extensions'].map { |ext| ext['id'] })
-        scc_products.find_by!(scc_id: up['id']).update!(scc_extensions: extensions)
+        begin
+          scc_products.find_by!(scc_id: up['id']).update!(scc_extensions: extensions)
+        rescue ActiveRecord::RecordNotFound
+          logger.info "Failed to find parent scc_product '#{up['name']}'."
+        end
       end
     end
   end

data/app/models/scc_extending.rb

@@ -1,4 +1,4 @@
 class SccExtending < ActiveRecord::Base
-  belongs_to :scc_product
-  belongs_to :scc_extension, class_name: :SccProduct
+  belongs_to :scc_product, inverse_of: :scc_extendings
+  belongs_to :scc_extension, class_name: :SccProduct, inverse_of: :inverse_scc_extendings
 end

data/app/models/scc_product.rb

@@ -8,9 +8,10 @@ class SccProduct < ActiveRecord::Base
   belongs_to :product, class_name: 'Katello::Product'
   has_one :organization, through: :scc_account
   has_and_belongs_to_many :scc_repositories
-  has_many :scc_extendings, dependent: :destroy
+  has_many :scc_extendings, inverse_of: :scc_product, dependent: :destroy
   has_many :scc_extensions, through: :scc_extendings
   has_many :inverse_scc_extendings,
+           inverse_of: :scc_extension,
            dependent: :destroy,
            class_name: :SccExtending,
            foreign_key: :scc_extension_id

data/app/views/scc_accounts/show.html.erb

@@ -1,24 +1,25 @@
-<% javascript 'foreman_scc_manager/scc_accounts'  %>
+<% javascript 'foreman_scc_manager/scc_accounts' %>
 <%= form_for([:bulk_subscribe, @scc_account], method: :put) do |f| %>
-<% def render_list_node(f, scc_product, parent_id = nil) %>
-<li>
-  <span class="scc_product_checkbox" id="<%= "scc_product_span_#{scc_product.id}" %>" <%= "data-parent=scc_product_span_#{parent_id}" if parent_id %>>
-<% if scc_product.product %>
-    <%= check_box_tag("scc_account[scc_unsubscribe_product_ids][]", scc_product.id, true, disabled: true) %>
-<% else %>
-    <%= check_box_tag("scc_account[scc_subscribe_product_ids][]", scc_product.id, false) %>
-<% end %>
-  </span>
-  <%= scc_product.friendly_name %>
-<% if scc_product.scc_extensions.any? %>
-  <ul>
-<% scc_product.scc_extensions.order(:friendly_name).each do |scc_extension| %>
-  <% render_list_node(f, scc_extension, scc_product.id) %>
-<% end %>
-  </ul>
-<% end %>
-</li>
-<% end %>
+  <% def render_list_node(f, scc_product, parent_id = nil) %>
+    <li>
+      <span class="scc_product_checkbox" id="<%= "scc_product_span_#{scc_product.id}" %>" <%= "data-parent=scc_product_span_#{parent_id}" if parent_id %>>
+        <% if scc_product.product %>
+          <%= check_box_tag("scc_account[scc_unsubscribe_product_ids][]", scc_product.id, true, disabled: true) %>
+        <% else %>
+          <%= check_box_tag("scc_account[scc_subscribe_product_ids][]", scc_product.id, false) %>
+        <% end %>
+      </span>
+      <%= scc_product.friendly_name %>
+      <% if scc_product.scc_extensions.any? %>
+        <ul>
+          <% scc_product.scc_extensions.order(:friendly_name).each do |scc_extension| %>
+            <% render_list_node(f, scc_extension, scc_product.id) %>
+          <% end %>
+        </ul>
+      <% end %>
+    </li>
+  <% end %>
+
   <%= f.hidden_field :prevent_missing, value: 1 %>
   <ul class="nav nav-tabs" data-tabs="tabs">
     <li class="active"><a href="#primary" data-toggle="tab"><%= _("SUSE Customer Center") %></a></li>
@@ -27,15 +28,16 @@
   <div class="tab-content">
     <div class="tab-pane active pre-scrollable" id="primary">
       <ul>
-<% if @scc_account.synced %>
-<% @scc_account.scc_products.where(product_type: 'base').order(:friendly_name).each do |scc_product| %>
-  <% render_list_node(f, scc_product) %>
-<% end %>
-<% else %>
-  <%= _('Please sync your SUSE subscriptions first.') %>
-<% end %>
+        <% if @scc_account.synced %>
+          <% @scc_account.scc_products.where(product_type: 'base').order(:friendly_name).each do |scc_product| %>
+            <% render_list_node(f, scc_product) %>
+          <% end %>
+        <% else %>
+          <%= _('Please sync your SUSE subscriptions first.') %>
+          <% submit_disabled = true %>
+        <% end %>
       </ul>
     </div>
-    <%= submit_or_cancel f %>
+    <%= submit_or_cancel f, false, {disabled: submit_disabled || false} %>
   </div>
 <% end %>

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails