katello 3.12.2 → 3.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3ef2a6f301c82689e48ffc4b9c4083b30520f8fd5452e9289cbdea4cc24b9d4
-  data.tar.gz: 7d2ce23015ff638867ab8ee8bd9869908119787adfea5cbee4f670503354a1fc
+  metadata.gz: 57454653134acc1d275c22a1e8df7bed953b3cc15fbc45cf6a519f197867d2d5
+  data.tar.gz: 07ed05ad436f0cf25cc31324fdf0d613eeed837b55926573dfc874505556ce1a
 SHA512:
-  metadata.gz: 463318dc443c762c2c8ff801ef80b27832393bae009df0cf3db72a57faa552a1f04aea15ea44c30d994c272a15372a25d7ae74846de396f87d9bc2c8832ba11a
-  data.tar.gz: 8863c9e32f07ee9c3acbc3abfe3fcd0daacef2607a2e2b2dee904838f1d817e04f7c7b74546840c9949ed0a18b223dd53ca381693de6f07a4fb8b4e745d36593
+  metadata.gz: a177b3f0adfd8a8a02c697faf17ac209f3c9adad880006087c1fa0fa59f27967f216abea195df1ca840feb733c77a5d45e95d6381abd3ef33f6f17346eecc73a
+  data.tar.gz: 2dd25b82086662e95942e799f2b8822be30ce6b8d66597b09acdab2d93596867fe82a8dec7052f8498d4672262f28aa963ad1e9dcbfd7f21b3c1a8a9e43e6eb8

data/app/models/katello/host/subscription_facet.rb

@@ -266,9 +266,17 @@ module Katello
 
         if hosts_size == 1
           host = hosts.first
-          found_uuid = host.fact_values.find { |fv| fv.fact_name_id == uuid_fact_id }
 
-          return host if host.name == host_name && (host.build || found_uuid&.value == host_uuid)
+          if host.name == host_name
+            unless host.build
+              found_uuid = host.fact_values.where(fact_name_id: uuid_fact_id).first
+              if found_uuid && found_uuid.value != host_uuid
+                fail Katello::Errors::RegistrationError, _("This host is reporting a DMI UUID that differs from the existing registration.")
+              end
+            end
+
+            return host
+          end
         end
 
         hostnames = hosts.pluck(:name).sort.join(', ')

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.12.2".freeze
+  VERSION = "3.12.3".freeze
 end

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js

@@ -130,6 +130,7 @@ class SubscriptionsTable extends Component {
       rows,
       subscriptions,
       tableColumns,
+      toggleSubscriptionGroup: this.toggleSubscriptionGroup,
       inlineEditController: this.getInlineEditController(),
       selectionController: this.getSelectionController(),
     };

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Table.js

@@ -15,6 +15,7 @@ const Table = ({
   rows,
   editing,
   groupedSubscriptions,
+  toggleSubscriptionGroup,
 }) => {
   const allSubscriptionResults = subscriptions.results;
 
@@ -30,7 +31,7 @@ const Table = ({
       // the group contains more then one subscription
       groupedSubscriptions[rowData.product_id].subscriptions.length > 1,
     isCollapsed: ({ rowData }) => !groupedSubscriptions[rowData.product_id].open,
-    toggle: ({ rowData }) => this.toggleSubscriptionGroup(rowData.product_id),
+    toggle: ({ rowData }) => toggleSubscriptionGroup(rowData.product_id),
   };
 
   const alwaysDisplayColumns = ['select'];
@@ -95,6 +96,7 @@ Table.propTypes = {
     results: PropTypes.array,
   }).isRequired,
   loadSubscriptions: PropTypes.func.isRequired,
+  toggleSubscriptionGroup: PropTypes.func.isRequired,
   selectionController: PropTypes.shape({}).isRequired,
   inlineEditController: PropTypes.shape({
     onCancel: PropTypes.func,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.12.2
+  version: 3.12.3
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails