katello 3.0.0.rc4 → 3.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 653220497b16edc164524fa46a3ca1701a3ec997
-  data.tar.gz: 1d2bb6d2639fb75c3753d79374bb247b234d59f1
+  metadata.gz: 187b57f332a5874b4a314c94c1b3e12f2b2fd66d
+  data.tar.gz: 64c23ed8c7a6f578f491c6eb5386f81159f72c04
 SHA512:
-  metadata.gz: 5ed4b7a5aef272f8d8f8c1033e0fd6a9ee67608cb09a1065fd782b142cbae65ee486e324180b7ed8a4c0ae473ba50c81e97788db18ea6f15c9c251ebe30e35cd
-  data.tar.gz: 03a81beeeac30c24ccb7fc8150b0c2541fc49d70fe2fa40527e0ad625158e8e90ed91b8eee6e281f5d83dedfadb220caad92c1202a475767ec628d815668764a
+  metadata.gz: e8bacef15a3899b32653906402c585a048b00bd76e3a294f91d906dc0d9b63db5f730ecdb6eca690f0f218e67a99e2069bc7699f764dddff08faefdd5ec994c2
+  data.tar.gz: a7c7121087bc8207fb8ccf73c01fcf77ea17b1442b88717919e891381beb0e88dd608f37404b6aa69bf607e313a2f62579d6b035d8da0be8ebdcb7c19929c293

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

@@ -13,7 +13,8 @@ $(document).on('ContentLoad', function(){
         KT.hosts.getPuppetEnvironmentSelect().data('content_puppet_match', 'true');
         KT.hosts.setDefaultPuppetEnvironment(KT.hosts.getSelectedContentView(), KT.hosts.getSelectedEnvironment());
     });
-
+    KT.hosts.update_media_enablement();
+    KT.hosts.set_media_selection_bindings();
 });
 
 KT.hosts.fetchContentViews = function () {
@@ -37,7 +38,7 @@ KT.hosts.signalContentViewFetch = function(fetching) {
     var select = KT.hosts.getContentViewSelect();
     var select2 = KT.hosts.getContentViewSelect2();
         //parent = select.parent(),
-        spinner = $('<img>').attr('src', '/assets/spinner.gif'),
+        spinner = $('<img>').attr('src', select.data("spinner-path")),
         spinner_id = "content_view_spinner";
 
     if(fetching) {
@@ -61,13 +62,14 @@ KT.hosts.setDefaultPuppetEnvironment = function(view_id, env_id) {
     if (view_id && env_id) {
         $.get('/hosts/puppet_environment_for_content_view', {content_view_id: view_id, lifecycle_environment_id: env_id}, function (data) {
             var select = KT.hosts.getPuppetEnvironmentSelect();
-            select.val(data.id);
-            select.trigger('change');
+            if (data !== null) {
+                select.val(data.id);
+                select.trigger('change');
+            }
         })
     }
 };
 
-
 KT.hosts.getPuppetEnvironmentSelect = function() {
     var select = $("#host_environment_id").first();
     if(select.length === 0) {
@@ -114,7 +116,7 @@ KT.hosts.getSelectedEnvironment = function () {
 
 KT.hosts.onKatelloHostEditLoad = function(){
     var prefxies = ['host', 'hostgroup'],
-        attributes = ['lifecycle_environment_id', 'content_view_id', 'environment_id', 'content_source_id', 'architecture_id', 'operatingsystem_id'];
+        attributes = ['lifecycle_environment_id', 'content_view_id', 'environment_id', 'content_source_id', 'architecture_id'];
 
     $.each(prefxies, function(index, prefix) {
         $.each(attributes, function(attrIndex, attribute) {
@@ -123,14 +125,11 @@ KT.hosts.onKatelloHostEditLoad = function(){
             });
         });
     });
-    KT.hosts.toggle_installation_medium();
 };
 
-
 KT.hosts.toggle_installation_medium = function() {
     var lifecycle_environment_id, content_source_id, architecture_id, operatingsystem_id, content_view_id;
 
-
     if ($('#hostgroup_parent_id').length > 0) {
       lifecycle_environment_id = KT.hosts.getSelectedEnvironment();
       content_view_id = KT.hosts.getSelectedContentView();
@@ -146,47 +145,130 @@ KT.hosts.toggle_installation_medium = function() {
     }
 
     if (content_view_id && lifecycle_environment_id && content_source_id && architecture_id && operatingsystem_id) {
-        $.ajax({
-            type:'get',
-            url: '/operatingsystems/' + operatingsystem_id + '/available_kickstart_repo',
-            data: {
-                lifecycle_environment_id: lifecycle_environment_id,
-                content_source_id: content_source_id,
-                architecture_id: architecture_id,
-                operatingsystem_id: operatingsystem_id,
-                content_view_id: content_view_id
-            },
-            error: function(jqXHR, status, error){
-                KT.hosts.show_medium_selectbox();
-            },
-            success: function(result){
-                if (result == null) {
-                    KT.hosts.show_medium_selectbox();
-                } else {
-                    // add kickstart_url div after checking that it doesn't exist
-                    // since this code is called 3 times
-                    if ($("#kt_kickstart_url").length == 0) {
-                      $('label[for="medium_id"]').after("<div id='kt_kickstart_url' class='col-md-8'></div>");
-                    }
-
-                    $("#host_medium_id").hide();
-                    $("#s2id_host_medium_id").hide();
-
-                    $("#hostgroup_medium_id").hide();
-                    $("#s2id_hostgroup_medium_id").hide();
-                    // populate kickstart_url inside div created above
-                    $("#kt_kickstart_url").html(result.name+"<br />"+result.path);
-                }
-            }
-        })
+        os_selected(KT.hosts.get_os_element());
+    }
+};
+
+KT.hosts.get_os_element = function () {
+    var select = $("#host_operatingsystem_id").first();
+    if(select.length === 0) {
+        select = $("#hostgroup_operatingsystem_id").first();
+    }
+    return select;
+};
+
+
+KT.hosts.get_media_selection_div = function () {
+    return $("#media_selection_section");
+};
+
+KT.hosts.get_install_media_div = function() {
+    return KT.hosts.get_media_selection_div().next();
+};
+
+KT.hosts.get_synced_content_div = function() {
+    return KT.hosts.get_media_selection_div().next().next();
+};
+
+KT.hosts.show_install_media = function(show) {
+    if (show) {
+        KT.hosts.get_install_media_div().show();
+    } else {
+        KT.hosts.get_install_media_div().hide();
+    }
+};
+
+KT.hosts.show_synced_content = function(show) {
+    if (show) {
+        KT.hosts.get_synced_content_div().show();
     } else {
-        KT.hosts.show_medium_selectbox();
+        KT.hosts.get_synced_content_div().hide();
     }
+};
+
+KT.hosts.update_media_type_selection = function (use_install_media) {
+    var elements = KT.hosts.get_media_selector_elements();
+    elements.filter('[value="install_media"]').prop('checked', use_install_media);
+    elements.filter('[value="synced_content"]').prop('checked', !use_install_media);
+    KT.hosts.update_media_enablement();
+};
+
+KT.hosts.media_selection_changed = function() {
+    KT.hosts.show_install_media(this.value === "install_media");
+    KT.hosts.show_synced_content(this.value !== "install_media");
+};
+
+KT.hosts.update_media_enablement = function () {
+    var value = KT.hosts.is_install_media_selected();
+    KT.hosts.show_install_media(value);
+    KT.hosts.show_synced_content(!value);
+};
+
+KT.hosts.is_install_media_selected = function() {
+    return KT.hosts.get_media_selector_elements().filter('[value="install_media"]').is(':checked');
+};
+
+KT.hosts.get_media_selector_elements = function() {
+    return $('input:radio[data-media-selector]');
+};
+
+KT.hosts.get_synced_content_dropdown = function() {
+    return $('select[data-kickstart-repository-id]');
+};
+
+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("");
+    $("#s2id_hostgroup_medium_id").val("");
+    activate_select2("#media_select");
+};
+
+KT.hosts.set_install_media_bindings = function() {
+    // reset the host medium id
+    $("#host_medium_id").change(KT.hosts.on_install_media_dropdown_change);
+    $("#s2id_host_medium_id").change(KT.hosts.on_install_media_dropdown_change);
+    $("#hostgroup_medium_id").change(KT.hosts.on_install_media_dropdown_change);
+    $("#s2id_hostgroup_medium_id").change(KT.hosts.on_install_media_dropdown_change);
+};
 
+KT.hosts.set_synced_content_bindings = function() {
+    KT.hosts.get_synced_content_dropdown().change(KT.hosts.on_synced_content_dropdown_change);
 };
 
-KT.hosts.show_medium_selectbox = function() {
-    $("#s2id_host_medium_id").show();
-    $("#s2id_hostgroup_medium_id").show();
-    $("#kt_kickstart_url").html('');
+KT.hosts.set_media_selection_bindings = function() {
+  KT.hosts.set_install_media_bindings();
+  KT.hosts.set_synced_content_bindings();
+  KT.hosts.get_media_selector_elements().change(KT.hosts.media_selection_changed);
+};
+
+// Note we are overriding the os_selected method in foreman
+// Hopefully when this gets resolved http://projects.theforeman.org/issues/14699
+// This method will get backed out.
+function os_selected(element){
+  var attrs = attribute_hash(['operatingsystem_id', 'organization_id', 'location_id', 'content_view_id',
+                              'lifecycle_environment_id', 'content_source_id', 'architecture_id', 'hostgroup_id',
+                              'medium_id', 'kickstart_repository_id']);
+  var url = $(element).attr('data-url');
+  foreman.tools.showSpinner();
+  $.ajax({
+    data: attrs,
+    type:'post',
+    url: url,
+    complete: function(){
+      reloadOnAjaxComplete(element);
+    },
+    success: function(request) {
+      $('#media_select').html(request);
+      reload_host_params();
+    }
+  });
+  update_provisioning_image();
 };

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -435,8 +435,8 @@ module Katello
     def authorize_proxy_routes
       deny_access unless (authenticate || authenticate_client)
 
-      route, _, params = Engine.routes.router.recognize(request) do |rte, match, parameters|
-        break rte, match, parameters if rte.name
+      route, params = Engine.routes.router.recognize(request) do |rte, parameters|
+        break rte, parameters if rte.name
       end
 
       # route names are defined in routes.rb (:as => :name)

data/app/controllers/katello/api/v2/activation_keys_controller.rb

@@ -5,6 +5,7 @@ module Katello
     before_filter :verify_presence_of_organization_or_environment, :only => [:index]
     before_filter :find_environment, :only => [:index, :create, :update]
     before_filter :find_optional_organization, :only => [:index, :create, :show]
+    before_filter :find_content_view, :only => [:index]
     before_filter :find_activation_key, :only => [:show, :update, :destroy, :available_releases, :copy, :product_content,
                                                   :available_host_collections, :add_host_collections, :remove_host_collections,
                                                   :content_override, :add_subscriptions, :remove_subscriptions,
@@ -293,6 +294,14 @@ module Katello
       fail HttpErrors::BadRequest, _("Either organization ID or environment ID needs to be specified")
     end
 
+    def find_content_view
+      if params.include?(:content_view_id)
+        cv_id = params[:content_view_id]
+        @content_view = ContentView.find_by(:id => cv_id)
+        fail HttpErrors::NotFound, _("Couldn't find content view '%s'") % cv_id if @content_view.nil?
+      end
+    end
+
     def activation_key_params
       key_params = params.require(:activation_key).permit(:name,
                                                           :description,

data/app/controllers/katello/api/v2/api_controller.rb

@@ -52,12 +52,7 @@ module Katello
       total = query.count
       query = resource.search_for(*search_options).where("#{resource.table_name}.id" => query)
 
-      if group.present?
-        query = query.select(group).group(group)
-        sub_total = query.count.length
-      else
-        sub_total = query.count
-      end
+      sub_total = scoped_search_sub_total(query, total, group)
 
       sort_attr = params[:sort_by] || default_sort_by
 
@@ -78,6 +73,8 @@ module Katello
       page = params[:page] || 1
       per_page = params[:per_page] || ::Setting::General.entries_per_page
 
+      query = (total.zero? || sub_total.zero?) ? [] : query
+
       scoped_search_results(query, sub_total, total, page, per_page)
     rescue ScopedSearch::QueryNotSupported => error
       return scoped_search_results(query, sub_total, total, page, per_page, error.message)
@@ -85,6 +82,16 @@ module Katello
 
     protected
 
+    def scoped_search_sub_total(query, total, group)
+      if group.present?
+        query = query.select(group).group(group)
+        sub_total = total.zero? ? 0 : query.count.length
+      else
+        sub_total = total.zero? ? 0 : query.count
+      end
+      sub_total
+    end
+
     def scoped_search_results(query, sub_total, total, page, per_page, error = nil)
       {
         :results  => query,

data/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb

@@ -70,7 +70,7 @@ module Katello
     def update
       update_params = rule_params
 
-      if @rule.filter.content_type == 'package'
+      if @rule.filter.content_type == ContentViewPackageFilter::CONTENT_TYPE
         update_params[:version] = "" unless rule_params[:version]
         update_params[:min_version] = "" unless rule_params[:min_version]
         update_params[:max_version] = "" unless rule_params[:max_version]

data/app/controllers/katello/api/v2/content_view_filters_controller.rb

@@ -18,7 +18,7 @@ module Katello
 
     def index_relation
       query = ContentViewFilter.where(:content_view_id => (@view || ContentView.readable))
-      query = query.where(:name => params[:name]) unless params[:name].blank?
+      query = query.where(:name => params[:name]) if params[:name]
       query
     end
 

data/app/controllers/katello/api/v2/environments_controller.rb

@@ -82,8 +82,6 @@ module Katello
       create_params[:organization] = @organization
       create_params[:prior] = @prior
       @environment = KTEnvironment.create!(create_params)
-      @organization.kt_environments << @environment
-      @organization.save!
       respond
     end
 

data/app/controllers/katello/api/v2/host_collections_controller.rb

@@ -51,8 +51,10 @@ module Katello
         end
       elsif @activation_key
         query = @activation_key.host_collections
-      else
+      elsif @organization
         query = HostCollection.readable.where(:organization_id => @organization.id)
+      else
+        query = HostCollection.readable
       end
       query = query.where(:name => params[:name]) if params[:name]
       query
@@ -67,7 +69,7 @@ module Katello
       @host_collection = HostCollection.new(host_collection_params_with_host_ids)
       @host_collection.organization = @organization
       @host_collection.save!
-      respond
+      respond_for_show(:resource => @host_collection)
     end
 
     api :PUT, "/host_collections/:id", N_("Update a host collection")

data/app/controllers/katello/api/v2/repositories_controller.rb

@@ -2,7 +2,7 @@ module Katello
   class Api::V2::RepositoriesController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_filter :find_organization, :only => [:index, :auto_complete_search]
+    before_filter :find_optional_organization, :only => [:index, :auto_complete_search]
     before_filter :find_product, :only => [:index, :auto_complete_search]
     before_filter :find_product_for_create, :only => [:create]
     before_filter :find_organization_from_product, :only => [:create]
@@ -36,7 +36,7 @@ module Katello
 
     api :GET, "/repositories", N_("List of enabled repositories")
     api :GET, "/content_views/:id/repositories", N_("List of repositories for a content view")
-    param :organization_id, :number, :required => true, :desc => N_("ID of an organization to show repositories in")
+    param :organization_id, :number, :desc => N_("ID of an organization to show repositories in")
     param :product_id, :number, :desc => N_("ID of a product to show repositories of")
     param :environment_id, :number, :desc => N_("ID of an environment to show repositories in")
     param :content_view_id, :number, :desc => N_("ID of a content view to show repositories in")
@@ -105,7 +105,12 @@ module Katello
         instance_ids += instances.where(:library_instance_id => nil)
         query = Repository.where(:id => instance_ids)
       elsif (params[:library] && !params[:environment_id]) || (params[:environment_id].blank? && params[:content_view_version_id].blank? && params[:content_view_id].blank?)
-        query = query.where(:content_view_version_id => @organization.default_content_view.versions.first.id)
+
+        if @organization
+          query = query.where(:content_view_version_id => @organization.default_content_view.versions.first.id)
+        else
+          query = query.in_default_view
+        end
       end
       query
     end
@@ -263,7 +268,7 @@ module Katello
     def upload_content
       fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload Docker content.") if @repository.docker?
 
-      filepaths = params[:content].collect do |content|
+      filepaths = Array.wrap(params[:content]).compact.collect do |content|
         {path: content.path, filename: content.original_filename}
       end
 
@@ -316,6 +321,7 @@ module Katello
 
     def find_product
       @product = Product.find(params[:product_id]) if params[:product_id]
+      find_organization_from_product if @organization.nil? && @product
     end
 
     def find_product_for_create

data/app/controllers/katello/api/v2/repository_sets_controller.rb

@@ -30,7 +30,7 @@ module Katello
       respond :resource => @product_content
     end
 
-    api :GET, "/products/:product_id/repository_sets/:id/available_repositories", N_("Get list or available repositories for the repository set")
+    api :GET, "/products/:product_id/repository_sets/:id/available_repositories", N_("Get list of available repositories for the repository set")
     param :id, :number, :required => true, :desc => N_("ID of the repository set")
     param :product_id, :number, :required => true, :desc => N_("ID of a product to list repository sets from")
     def available_repositories
@@ -65,8 +65,8 @@ module Katello
       respond_for_async :resource => task
     end
 
-    api :PUT, "/products/:product_id/repository_sets/:id/disable", N_("Disable a repository form the set")
-    param :id, :number, :required => true, :desc => N_("ID of the repository set to enable")
+    api :PUT, "/products/:product_id/repository_sets/:id/disable", N_("Disable a repository from the set")
+    param :id, :number, :required => true, :desc => N_("ID of the repository set to disable")
     param :product_id, :number, :required => true, :desc => N_("ID of the product containing the repository set")
     param :basearch, String, :required => false, :desc => N_("Basearch to disable")
     param :releasever, String, :required => false, :desc => N_("Releasever to disable")

data/app/controllers/katello/api/v2/systems_controller.rb

@@ -112,9 +112,12 @@ module Katello
 
     def find_system
       @system = System.where(:uuid => params[:id]).first
-      if @system.nil?
+      @host = ::Host.where(:id => params[:id]).first
+      if @system.nil? && @host.nil?
         Resources::Candlepin::Consumer.get params[:id] # check with candlepin if system is Gone, raises RestClient::Gone
         fail HttpErrors::NotFound, _("Couldn't find content host '%s'") % params[:id]
+      elsif @system.nil?
+        @system = @host.content_host
       end
     end