katello 4.21.1.1 → 5.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9014aa0cdb8ab0d32088e8f12779bf7dc577a94e19d8f1c05941912c45ef5074
-  data.tar.gz: 45ff000f8d491b08946b291ea23b8bde157c2e9ff3d69699ad07223662fee5e2
+  metadata.gz: 4e653190d3fe14b62c359141f803d7bd85414aae4f23139b16b645e5141e9014
+  data.tar.gz: c30fd8dc07ddeff325744cc40e7b30b12ab710abfb75b6e5d580099ae9cdd4ea
 SHA512:
-  metadata.gz: 209485e342629385d685e88cb5c5f17853fc43f3fe9408f2d61ecf0e3525e2197e4afc14f001d7e2e8328b4cedcc9ea60d9501dd3cb04a8336e00b534d78edc1
-  data.tar.gz: 88b5093f26cdf88be82cba617a475e9228d8e5192db72170deadd945ea2b1939ff504ec6a893b551b750c8cc6394859a1fabebde835869f585fd609bedf90b3c
+  metadata.gz: 91c5b0e77683c1f53f26c375941ef7b8eb3b30604c3b5e0ca6d95f82532a666915b42d28b8d6dbf8ad66d8ef0f188ba3d3135c8b90b762afd74ea3392efd9fab
+  data.tar.gz: 39169742a17e71c8a7b8ade2a8879b4824c5ee77cc01d172f97eb4802577bb7083c9ec70e022433510edfe2f773a83b1e19f2a49b587074e482738e90cefb349

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

@@ -4,36 +4,24 @@ KT.hosts = {};
 $(document).on('ContentLoad', function(){
     KT.hosts.onKatelloHostEditLoad();
     window.tfm.hosts.registerPluginAttributes("os",
-         ['lifecycle_environment_id', 'content_view_id', 'environment_id', 'content_source_id', 'architecture_id', 'parent_id']);
-
-    $("#hostgroup_lifecycle_environment_id").on("change",KT.hosts.environmentChanged);
-    $("#host_lifecycle_environment_id").on("change", KT.hosts.environmentChanged);
+         ['content_view_environment_id', 'content_source_id', 'architecture_id', 'parent_id']);
 
     KT.hosts.update_media_enablement();
     KT.hosts.set_media_selection_bindings();
 });
 
 KT.hosts.contentSourceChanged = function() {
-  $("#hostgroup_lifecycle_environment_id").val("");
-  $("#host_lifecycle_environment_id").val("");
   $("#hostgroup_content_view_environment_id").val("");
-  KT.hosts.fetchEnvironments();
-  KT.hosts.environmentChanged();
+  $("#host_content_view_environment_id").val("");
   KT.hosts.refreshContentViewEnvironments();
 };
 
-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
-  var previous_content_view = KT.hosts.getSelectedContentView();
-
-  KT.hosts.fetchContentViews();
-  KT.hosts.toggle_installation_medium(previous_content_view);
-};
-
 KT.hosts.refreshContentViewEnvironments = function() {
   var select = $("#hostgroup_content_view_environment_id");
-  if (select.length === 0) return; // Only for hostgroups
+  if (select.length === 0) {
+    select = $("#host_content_view_environment_id");
+  }
+  if (select.length === 0) return;
 
   var content_source_id = $('#content_source_id').val();
   var orgIdsElem = $("#hostgroup_organization_ids");
@@ -43,7 +31,10 @@ KT.hosts.refreshContentViewEnvironments = function() {
     orgIds = orgIdsElem.data('useds');
   }
   if (orgIds === undefined || orgIds === null || orgIds.length === 0) {
-    return; // Can't fetch without organization
+    orgIds = [$("#host_organization_id").val()];
+  }
+  if (orgIds === undefined || orgIds === null || orgIds.length === 0) {
+    return;
   }
   var orgId = Array.isArray(orgIds) ? orgIds[0] : orgIds;
 
@@ -63,24 +54,22 @@ KT.hosts.refreshContentViewEnvironments = function() {
   $.get(url, params, function(data) {
     var foundPreviousValue = false;
 
-    // Add inherit option back if it was there
-    if (previousInheritText && (previousInheritText.includes('Inherit') || previousInheritText === '')) {
+    if (inheritOption.length && (inheritOption.val() === '' || previousInheritDataId)) {
       var inheritOpt = $("<option />").text(previousInheritText).val('');
       if (previousInheritDataId) inheritOpt.attr('data-id', previousInheritDataId);
       select.append(inheritOpt);
     }
 
-    $.each(data.results, function(index, cve) {
-      var label = cve.lifecycle_environment.name + ' / ' + cve.content_view.name;
-      var option = $("<option />").val(cve.id).text(label);
-      if (cve.id === parseInt(previousValue)) {
+    $.each(data.results, function(index, cvEnv) {
+      var label = cvEnv.label;
+      var option = $("<option />").val(cvEnv.id).text(label);
+      if (cvEnv.id === parseInt(previousValue)) {
         option.prop('selected', true);
         foundPreviousValue = true;
       }
       select.append(option);
     });
 
-    // If previous value not found in filtered list, select the blank/inherit option
     if (!foundPreviousValue) {
       select.val('');
     }
@@ -89,126 +78,9 @@ KT.hosts.refreshContentViewEnvironments = function() {
   });
 };
 
-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 orgIdsElem = $("#hostgroup_organization_ids");
-    var orgIds = orgIdsElem.val();
-    if (orgIds === undefined || orgIds === null || orgIds.length === 0) {
-        orgIds = orgIdsElem.data('useds');
-    }
-    if (orgIds === undefined || orgIds === null || orgIds.length === 0) {
-        orgIds = [$("#host_organization_id").val()];
-    };
-    orgIds = orgIds.map(function (id) {
-            return 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 (!orgIds.includes(env.organization_id)) 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();
-    var option;
-    var previous_view = KT.hosts.getSelectedContentView();
-    var previousInheritViewText = select.find('option:first-child').text();
-    select.find('option').remove();
-    if (envId) {
-        KT.hosts.signalContentViewFetch(true);
-        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(''));
-            }
-            $.each(data.results, function(index, view) {
-                option = $("<option />").val(view.id).text(view.name);
-                if (view.id === parseInt(previous_view)) {
-                  option.prop('selected', true);
-                }
-                select.append(option);
-            });
-            select.trigger('change');
-            KT.hosts.signalContentViewFetch(false);
-        });
-    }
-};
-
-KT.hosts.signalContentViewFetch = function(fetching) {
-    var select = KT.hosts.getContentViewSelect();
-    var select2 = KT.hosts.getContentViewSelect2();
-        spinner = $('<img>').attr('src', select.data("spinner-path")),
-        spinner_id = "content_view_spinner";
-
-    if(fetching) {
-        select.hide();
-        select2.hide();
-        $(spinner).attr('id', spinner_id).insertAfter(select);
-    } else {
-        select2.show();
-        $('#' + spinner_id).remove();
-    }
-};
-
-KT.hosts.getContentViewSelect2 = function() {
-    var select = $("#s2id_host_content_view_id").first();
-    if(select.length === 0) {
-        select = $("#s2id_hostgroup_content_view_id").first();
-    }
-    return select;
-};
-
-KT.hosts.getContentViewSelect = function() {
-    var select = $("#host_content_view_id").first();
-    if(select.length === 0) {
-        select = $("#hostgroup_content_view_id").first();
-    }
-    return select;
-};
-
-KT.hosts.getSelectedContentView = function() {
-    var select = KT.hosts.getContentViewSelect();
-    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 === null || envId.length === 0) {
-        envId = $("#host_lifecycle_environment_id").val()
-    }
-    if(envId === undefined || envId === null || envId.length === 0) {
-        envId = $("#hostgroup_lifecycle_environment_id > option:selected").data("id");
-    }
-
-    if(envId && envId.length === 0) {
-        envId = undefined;
-    }
-    return envId;
-};
-
 KT.hosts.onKatelloHostEditLoad = function(){
     var prefixes = ['host', 'hostgroup'],
-        attributes = ['content_view_id', 'environment_id', 'architecture_id'];
+        attributes = ['content_view_environment_id', 'architecture_id'];
 
     $('body').off('.hostsContentSourceNS');
 
@@ -226,26 +98,38 @@ KT.hosts.onKatelloHostEditLoad = function(){
     });
 };
 
-KT.hosts.toggle_installation_medium = function(content_view_id) {
-    var lifecycle_environment_id, content_source_id, architecture_id, operatingsystem_id;
-
-    if (content_view_id === undefined) {
-      content_view_id = KT.hosts.getSelectedContentView();
+KT.hosts.getSelectedContentViewEnvironment = function() {
+    var cvEnvId = $("#hostgroup_content_view_environment_id").val();
+    if (!cvEnvId) {
+        cvEnvId = $("#host_content_view_environment_id").val();
+    }
+    if (!cvEnvId) {
+        cvEnvId = $("#hostgroup_content_view_environment_id > option:selected").data("id");
+    }
+    if (!cvEnvId) {
+        var hiddenInput = $("input[name='host[content_facet_attributes][content_view_environment_ids][]']").first();
+        if (hiddenInput.length) {
+            cvEnvId = hiddenInput.val();
+        }
     }
+    return cvEnvId;
+};
+
+KT.hosts.toggle_installation_medium = function() {
+    var content_view_environment_id, content_source_id, architecture_id, operatingsystem_id;
+
+    content_view_environment_id = KT.hosts.getSelectedContentViewEnvironment();
+    content_source_id = $('#content_source_id').val();
 
     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();
       operatingsystem_id = $('#hostgroup_operatingsystem_id').val();
     } else {
-      lifecycle_environment_id = KT.hosts.getSelectedEnvironment();
-      content_source_id = $('#content_source_id').val();
       architecture_id = $('#host_architecture_id').val();
       operatingsystem_id = $('#host_operatingsystem_id').val();
     }
 
-    if (content_view_id && lifecycle_environment_id && content_source_id && architecture_id && operatingsystem_id) {
+    if (content_view_environment_id && content_source_id && architecture_id && operatingsystem_id) {
         os_selected(KT.hosts.get_os_element());
     }
 };
@@ -318,13 +202,11 @@ KT.hosts.get_synced_content_dropdown = function() {
 };
 
 KT.hosts.on_install_media_dropdown_change = function() {
-    // reset the kickstart-repository-id .. They are either or.
     KT.hosts.get_synced_content_dropdown().val("");
     activate_select2("#media_select");
 };
 
 KT.hosts.on_synced_content_dropdown_change = function() {
-    // reset the kickstart-repository-id .. They are either or.
     $("#host_medium_id").val("");
     $("#s2id_host_medium_id").val("");
     $("#hostgroup_medium_id").val("");
@@ -333,7 +215,6 @@ KT.hosts.on_synced_content_dropdown_change = function() {
 };
 
 KT.hosts.set_install_media_bindings = function() {
-    // reset the host medium id
     $("#host_medium_id").on("select2:select", KT.hosts.on_install_media_dropdown_change);
     $("#s2id_host_medium_id").on("select2:select", KT.hosts.on_install_media_dropdown_change);
     $("#hostgroup_medium_id").on("select2:select", KT.hosts.on_install_media_dropdown_change);