katello 4.13.1 → 4.14.0.rc1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b483b80f6a5f7194a08c115f000a799cf5fbfadb5ff15a3c23425474858083e
-  data.tar.gz: 40c8c3a668d0cf608ad9d4c051a5eebd6fa8c1bca6f6b5ee9821ebb53aabaff1
+  metadata.gz: e36ee265bced92108aec50be31ccc25ad131c7a114e3af6f10f33d9dacb2c815
+  data.tar.gz: 84ce98f9eb8a2f0ca23d5d6733b782d885f26c4d5b269a864244796289d29e71
 SHA512:
-  metadata.gz: 4752d03a68ac8daa4499926108b811b644d29fea06dde68e8a7ebe0f3571e23d6329c23d8acc6f66eb49b675118d3a7bb7e9e00d08f499b77597f841be20c63c
-  data.tar.gz: ed21c09ff884e6a3b8a7e23dd2e824810507b0d84b058368c731e5479fcd9a61d778d0d7e4110db5b2ca8d6c14e9e64521b9e80660bfc06a05579b9226e366e6
+  metadata.gz: 87cdf4ff20559526fc054b7107d720152257d6593c83e30ad952523ceae943edf4b50ab82235e0ce9ed060b5339621f54301025d46f62a562804411f1cae0063
+  data.tar.gz: 74db670edc0382cb25b0c5cd21977c83dc205cc356eb80b7fcd10476ff379529a331c29cd38474c64f2b6612ef7caf0a7c1935dc3d343bfd69f0b718bdccfaa5

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -36,15 +36,19 @@ KT.hosts.fetchEnvironments = function () {
   select.find('option').remove();
   if (content_source_id) {
     var url = tfm.tools.foremanUrl('/katello/api/capsules/' + content_source_id);
-    var orgId = $('#host_organization_id').val();
+    var orgIds = $("#hostgroup_organization_ids").val();
+    if(orgIds === undefined || orgIds === null || orgIds.length === 0) {
+        orgIds = [$("#host_organization_id").val()];
+    };
+    orgIds = orgIds.map(id => Number(id));
     $.get(url, function (content_source) {
-      $.each(content_source.lifecycle_environments, function(index, env) {
-    // Don't show environments that aren't in the selected org. See jQuery.each() docs    
-    if (orgId && env.organization_id != orgId) return true;
-	option = $("<option />").val(env.id).text(env.name);
-	select.append(option);
-      });
-      select.trigger('change');
+        $.each(content_source.lifecycle_environments, function(index, env) {
+            // Don't show environments that aren't in the selected org. See jQuery.each() docs    
+            if (!orgIds.includes(env.organization_id)) return true;
+            option = $("<option />").val(env.id).text(env.name);
+            select.append(option);
+        });
+        select.trigger('change');
     });
   }
 };