katello 4.8.4 → 4.9.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46269d021a36d01d1cd9a655da9b12e73acfa52a2801766d1b5b716905b71114
-  data.tar.gz: 1d69cfc2c26463e943b8a68f5fc8dadb926690f9d49a1a3ce4a0738b05720015
+  metadata.gz: 6ca8e5c339f17e38c34b16b000f420cdd7dd1d728826db1bd7bc04869e2d93c1
+  data.tar.gz: 01a11df500f4474eb063ca3a213babb50b72181dc03468a6d59e48c70aa15636
 SHA512:
-  metadata.gz: 7d71fab9ddd5f6370c2f263a00e4c81d8b61ed4eeb8435aaab8d1e38c05ee4af595fefff4ae0e738abd0911abbfb007271a493686b025a99e46ec07efed78a37
-  data.tar.gz: cf0e518f9cf7702c43d72ab2fa7dbb4fd45b74145176a29d202952394947fd14e4a37b9994c06c7e6327eb7d864ff80779498cecd11b64b1c194e80b10ef430a
+  metadata.gz: aa294960e367aab5f65d0b3a7fd1513d4cd5f1f5534cb591b055bab41ea3599428645d712cbb57a0a8a8b8739a61fbc8c5a4a5234b4a6897f617586bcddeb1e6
+  data.tar.gz: 4f1cb92f021810d29b49843d2e439dae4ea155b120bfbcebe008a25ec0b85235f5ae20e6b063f3a399099318c3bfe68d550772bb2609eb4b154bdd0eebcb031d

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

@@ -13,6 +13,13 @@ $(document).on('ContentLoad', function(){
     KT.hosts.set_media_selection_bindings();
 });
 
+KT.hosts.contentSourceChanged = function() {
+  $("#hostgroup_lifecycle_environment_id").val("");
+  $("#host_lifecycle_environment_id").val("");
+  KT.hosts.fetchEnvironments();
+  KT.hosts.environmentChanged();
+};
+
 KT.hosts.environmentChanged = function() {
   // if we don't save the currently selected view it's likely
   // it will be undefined in toggle_installation_medium due to the CV dropdown reload
@@ -22,6 +29,26 @@ KT.hosts.environmentChanged = function() {
   KT.hosts.toggle_installation_medium(previous_content_view);
 };
 
+KT.hosts.fetchEnvironments = function () {
+  var select = KT.hosts.getEnvironmentSelect();
+  var content_source_id = $('#content_source_id').val();
+  var option;
+  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();
+    $.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');
+    });
+  }
+};
+
 KT.hosts.fetchContentViews = function () {
     var select = KT.hosts.getContentViewSelect();
     var envId = KT.hosts.getSelectedEnvironment();
@@ -31,7 +58,7 @@ KT.hosts.fetchContentViews = function () {
     select.find('option').remove();
     if (envId) {
         KT.hosts.signalContentViewFetch(true);
-        var url = tfm.tools.foremanUrl('/katello/api/v2/content_views/');
+        var url = tfm.tools.foremanUrl('/katello/api/v2/content_views');
         $.get(url, {environment_id: envId, full_result: true}, function (data) {
             if ($('#hostgroup_parent_id').length > 0) {
                 select.append($("<option />").text(previousInheritViewText).val(''));
@@ -86,12 +113,20 @@ KT.hosts.getSelectedContentView = function() {
     return select.val() || select.find("option:selected").data("id");
 };
 
+KT.hosts.getEnvironmentSelect = function() {
+    var select = $("#hostgroup_lifecycle_environment_id").first();
+    if(select.length === 0) {
+        select = $("#host_lifecycle_environment_id").first();
+    }
+    return select;
+};
+
 KT.hosts.getSelectedEnvironment = function () {
     var envId = $("#hostgroup_lifecycle_environment_id").val();
-    if(envId === undefined || envId.length === 0) {
+    if(envId === undefined || envId === null || envId.length === 0) {
         envId = $("#host_lifecycle_environment_id").val()
     }
-    if(envId === undefined || envId.length === 0) {
+    if(envId === undefined || envId === null || envId.length === 0) {
         envId = $("#hostgroup_lifecycle_environment_id > option:selected").data("id");
     }
 
@@ -114,6 +149,7 @@ KT.hosts.onKatelloHostEditLoad = function(){
     });
 
     $('body').on('change', '#content_source_id', function () {
+        KT.hosts.contentSourceChanged();
         KT.hosts.toggle_installation_medium();
     });
 };
@@ -125,7 +161,7 @@ KT.hosts.toggle_installation_medium = function(content_view_id) {
       content_view_id = KT.hosts.getSelectedContentView();
     }
 
-    if ($('#hostgroup_parent_id').length > 0) {
+    if ($('#hostgroup_operatingsystem_id').data('type') == 'hostgroup') {
       lifecycle_environment_id = KT.hosts.getSelectedEnvironment();
       content_source_id = $('#content_source_id').val();
       architecture_id = $('#hostgroup_architecture_id').val();