katello 3.5.2 → 3.6.0.rc1

data/app/views/katello/sync_management/index.html.erb

@@ -13,6 +13,10 @@
     KT.permissions = { "syncable" : <%= any_syncable? %> };
 <% end %>
 
+<% if Organization.current -%>
+    <%= hidden_field_tag :organization_id, Organization.current.id%>
+<% end %>
+
 <div class="grid_4">
   <h2>
     <%= _("Sync Status") %>

data/app/views/smart_proxies/pulp_status.html.erb

@@ -1,23 +1,23 @@
 <div class="col-md-4">
-  <%= _('Pulp server version') %>
+  <strong><%= _('Pulp server version') %></strong>
 </div>
 <div class="col-md-8">
   <%= @pulp_status['versions']['platform_version'] %>
 </div>
 <div class="col-md-4">
-  <%= _('Database connection') %>
+  <strong><%= _('Database connection') %></strong>
 </div>
 <div class="col-md-8">
-  <%= boolean_to_icon(@pulp_status['database_connection']['connected']) %>
+  <strong><%= boolean_to_icon(@pulp_status['database_connection']['connected']) %></strong>
 </div>
 <div class="col-md-4">
-  <%= _('Messaging connection') %>
+  <strong><%= _('Messaging connection') %></strong>
 </div>
 <div class="col-md-8">
-  <%= boolean_to_icon(@pulp_status['messaging_connection']['connected']) %>
+  <strong><%= boolean_to_icon(@pulp_status['messaging_connection']['connected']) %></strong>
 </div>
 <div class="col-md-4">
-  <%= _('Workers') %>
+  <strong><%= _('Workers') %></strong>
 </div>
 <div class="col-md-8">
   <%= @pulp_status['known_workers'].size %><br />

data/config/katello.yaml.example

@@ -40,10 +40,6 @@
     # example https://localhost/pulp/api
     :url: https://localhost/pulp/api/v2/
 
-    # Specify your oauth key and secret used to authenticate between Katello and Pulp
-    :oauth_key: katello
-    :oauth_secret: katello
-
     :sync_threads: 4
     :bulk_load_size: 100
     # refers to the apache certificate

data/config/routes.rb

@@ -28,4 +28,7 @@ Katello::Engine.routes.draw do
       match '/remote_execution' => 'remote_execution#create', :via => [:post]
     end
   end
+
+  match '/xui' => 'react#index', :via => [:get]
+  match '/xui/*page' => 'react#index', :via => [:get]
 end

data/config/routes/api/v2.rb

@@ -106,6 +106,7 @@ Katello::Engine.routes.draw do
             post :promote
             post :export
             put :republish_repositories
+            get :available_errata, :controller => :errata
           end
           collection do
             get :auto_complete_search
@@ -114,12 +115,26 @@ Katello::Engine.routes.draw do
         end
 
         api_resources :ostree_branches, :only => [:index, :show] do
+          collection do
+            get :auto_complete_search
+            get :compare
+          end
+        end
+
+        api_resources :debs, :only => [:index, :show] do
           collection do
             get :auto_complete_search
           end
         end
 
         api_resources :docker_manifests, :only => [:index, :show] do
+          collection do
+            get :auto_complete_search
+            get :compare
+          end
+        end
+
+        api_resources :docker_manifest_lists, :only => [:index, :show] do
           collection do
             get :auto_complete_search
           end
@@ -129,6 +144,7 @@ Katello::Engine.routes.draw do
           collection do
             get :auto_complete_search
             get :auto_complete_name
+            get :compare
           end
         end
 
@@ -139,13 +155,16 @@ Katello::Engine.routes.draw do
 
         api_resources :errata, :only => [:index, :show] do
           collection do
-            get :compare
             get :auto_complete_search
+            get :compare
           end
         end
 
         api_resources :gpg_keys, :only => [:index, :show, :create, :update, :destroy] do
-          post :content, :on => :member
+          member do
+            get :content
+            post :content, :action => :set_content
+          end
           get :auto_complete_search, :on => :collection
         end
 
@@ -193,6 +212,7 @@ Katello::Engine.routes.draw do
             get :auto_complete_search
             get :auto_complete_name
             get :auto_complete_arch
+            get :compare
           end
         end
 
@@ -201,12 +221,14 @@ Katello::Engine.routes.draw do
             get :auto_complete_search
             post :create
             delete :destroy
+            get :compare
           end
         end
 
         api_resources :files, :only => [:index, :show], :controller => 'file_units' do
           collection do
             get :auto_complete_search
+            get :compare
           end
         end
 
@@ -229,7 +251,10 @@ Katello::Engine.routes.draw do
           end
         end
         api_resources :puppet_modules, :only => [:index, :show] do
-          get :auto_complete_search, :on => :collection
+          collection do
+            get :auto_complete_search
+            get :compare
+          end
         end
 
         api_resources :repositories, :only => [:index, :create, :show, :destroy, :update] do
@@ -300,7 +325,9 @@ Katello::Engine.routes.draw do
           api_resources :errata, :only => [:index, :show], :constraints => {:id => /[0-9a-zA-Z\-\+%_.:]+/}
           api_resources :puppet_modules, :only => [:index, :show]
           api_resources :docker_manifests, :only => [:index, :show]
+          api_resources :docker_manifest_lists, :only => [:index, :show]
           api_resources :docker_tags, :only => [:index, :show]
+          api_resources :debs, :only => [:index, :show]
 
           api_resources :ostree_branches, :only => [:index, :show]
 

data/config/routes/overrides.rb

@@ -69,6 +69,7 @@ Foreman::Application.routes.draw do
             match '/bulk/content_overrides' => 'hosts_bulk_actions#content_overrides', :via => :put
 
             match '/bulk/install_content' => 'hosts_bulk_actions#install_content', :via => :put
+            match '/bulk/applicable_errata' => 'hosts_bulk_actions#applicable_errata', :via => :post
             match '/bulk/installable_errata' => 'hosts_bulk_actions#installable_errata', :via => :post
             match '/bulk/update_content' => 'hosts_bulk_actions#update_content', :via => :put
             match '/bulk/remove_content' => 'hosts_bulk_actions#remove_content', :via => :put

data/db/migrate/20131014135042_katello_tables.rb

@@ -1,4 +1,4 @@
-class KatelloTables < ActiveRecord::Migration
+class KatelloTables < ActiveRecord::Migration[4.2]
 
   def self.up
 

data/db/migrate/20131014225132_add_users_fields.rb

@@ -1,4 +1,4 @@
-class AddUsersFields < ActiveRecord::Migration
+class AddUsersFields < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :helptips_enabled, :boolean, :default => true
     add_column :users, :hidden, :boolean, :default => false, :null => false

data/db/migrate/20131016124255_add_foreign_keys_engine.rb

@@ -1,4 +1,4 @@
-class AddForeignKeysEngine < ActiveRecord::Migration
+class AddForeignKeysEngine < ActiveRecord::Migration[4.2]
   # rubocop:disable MethodLength
   def change
     add_foreign_key "katello_activation_keys", "katello_content_views", :column => 'content_view_id', :name => "activation_keys_content_view_id_fk"

data/db/migrate/20131120225132_add_organization_fields.rb

@@ -1,4 +1,4 @@
-class AddOrganizationFields < ActiveRecord::Migration
+class AddOrganizationFields < ActiveRecord::Migration[4.2]
   def change
     add_column :taxonomies, :description, :text unless column_exists?(:taxonomies, :description)
     add_column :taxonomies, :label, :string, :limit => 255

data/db/migrate/20131216212502_add_quantity_to_katello_key_pools.rb

@@ -1,4 +1,4 @@
-class AddQuantityToKatelloKeyPools < ActiveRecord::Migration
+class AddQuantityToKatelloKeyPools < ActiveRecord::Migration[4.2]
   def change
     add_column :katello_key_pools, :quantity, :integer
   end

data/db/migrate/20131216212621_add_cp_id_to_katello_activation_keys.rb

@@ -1,4 +1,4 @@
-class AddCpIdToKatelloActivationKeys < ActiveRecord::Migration
+class AddCpIdToKatelloActivationKeys < ActiveRecord::Migration[4.2]
   def change
     add_column :katello_activation_keys, :cp_id, :string, :limit => 255
     add_column :katello_activation_keys, :label, :string, :limit => 255

data/db/migrate/20131218174203_drop_katello_key_pools_table.rb

@@ -1,4 +1,4 @@
-class DropKatelloKeyPoolsTable < ActiveRecord::Migration
+class DropKatelloKeyPoolsTable < ActiveRecord::Migration[4.2]
   def up
     drop_table :katello_key_pools
   end

data/db/migrate/20140110000001_update_environments_add_katello_id.rb

@@ -1,4 +1,4 @@
-class UpdateEnvironmentsAddKatelloId < ActiveRecord::Migration
+class UpdateEnvironmentsAddKatelloId < ActiveRecord::Migration[4.2]
   def up
     add_column :environments, :katello_id, :string, :limit => 255
     add_index :environments, :katello_id

data/db/migrate/20140117160939_refactor_content_views.rb

@@ -1,4 +1,4 @@
-class RefactorContentViews < ActiveRecord::Migration
+class RefactorContentViews < ActiveRecord::Migration[4.2]
   # rubocop:disable MethodLength
   def up
     remove_foreign_key "katello_component_content_views", :name => "component_content_views_content_view_definition_id_fk"

data/db/migrate/20140206200439_create_content_view_puppet_modules.rb

@@ -1,4 +1,4 @@
-class CreateContentViewPuppetModules < ActiveRecord::Migration
+class CreateContentViewPuppetModules < ActiveRecord::Migration[4.2]
   def change
     create_table :katello_content_view_puppet_modules do |t|
       t.references :content_view

data/db/migrate/20140212131812_create_content_view_package_filter_rules.rb

@@ -1,4 +1,4 @@
-class CreateContentViewPackageFilterRules < ActiveRecord::Migration
+class CreateContentViewPackageFilterRules < ActiveRecord::Migration[4.2]
   def change
     create_table :katello_content_view_package_filter_rules do |t|
       t.references :content_view_filter

data/db/migrate/20140212143454_create_content_view_package_group_filter_rules.rb

@@ -1,4 +1,4 @@
-class CreateContentViewPackageGroupFilterRules < ActiveRecord::Migration
+class CreateContentViewPackageGroupFilterRules < ActiveRecord::Migration[4.2]
   def change
     create_table :katello_content_view_package_group_filter_rules do |t|
       t.references :content_view_filter

data/db/migrate/20140212143642_create_content_view_erratum_filter_rules.rb

@@ -1,4 +1,4 @@
-class CreateContentViewErratumFilterRules < ActiveRecord::Migration
+class CreateContentViewErratumFilterRules < ActiveRecord::Migration[4.2]
   def change
     create_table :katello_content_view_erratum_filter_rules do |t|
       t.references :content_view_filter

data/db/migrate/20140217145303_remove_changeset.rb

@@ -1,4 +1,4 @@
-class RemoveChangeset < ActiveRecord::Migration
+class RemoveChangeset < ActiveRecord::Migration[4.2]
   def up
     drop_table "katello_changeset_content_views"
     drop_table "katello_changeset_users"

data/db/migrate/20140217160132_create_content_view_history.rb

@@ -1,4 +1,4 @@
-class CreateContentViewHistory < ActiveRecord::Migration
+class CreateContentViewHistory < ActiveRecord::Migration[4.2]
   def up
     create_table 'katello_content_view_histories' do |t|
       t.references :katello_content_view_version, :null => false

data/db/migrate/20140222022712_remove_provider_discovery.rb

@@ -1,4 +1,4 @@
-class RemoveProviderDiscovery < ActiveRecord::Migration
+class RemoveProviderDiscovery < ActiveRecord::Migration[4.2]
   def up
     remove_foreign_key "katello_providers", :name => "providers_discovery_task_id_fk"
     remove_column :katello_providers, :discovery_url

data/db/migrate/20140305101813_allow_null_for_repository_content_id.rb

@@ -1,4 +1,4 @@
-class AllowNullForRepositoryContentId < ActiveRecord::Migration
+class AllowNullForRepositoryContentId < ActiveRecord::Migration[4.2]
   def change
     change_column :katello_repositories, :content_id, :string, null: true,
       :limit => 255

data/db/migrate/20140306132108_create_content_view_puppet_environments.rb

@@ -1,4 +1,4 @@
-class CreateContentViewPuppetEnvironments < ActiveRecord::Migration
+class CreateContentViewPuppetEnvironments < ActiveRecord::Migration[4.2]
   def change
     create_table :katello_content_view_puppet_environments do |t|
       t.references :content_view_version

data/db/migrate/20140310102051_repository_add_checksum_type.rb

@@ -1,4 +1,4 @@
-class RepositoryAddChecksumType < ActiveRecord::Migration
+class RepositoryAddChecksumType < ActiveRecord::Migration[4.2]
   def up
     add_column :katello_repositories, :checksum_type, :string, :null => true,
       :limit => 255

data/db/migrate/20140318174203_drop_cdn_import_success_column.rb

@@ -1,4 +1,4 @@
-class DropCdnImportSuccessColumn < ActiveRecord::Migration
+class DropCdnImportSuccessColumn < ActiveRecord::Migration[4.2]
   def up
     remove_column :katello_products, :cdn_import_success
   end

data/db/migrate/20140325185413_create_content_view_foreign_keys.rb

@@ -1,4 +1,4 @@
-class CreateContentViewForeignKeys < ActiveRecord::Migration
+class CreateContentViewForeignKeys < ActiveRecord::Migration[4.2]
   def up
     add_foreign_key :katello_content_view_environments, :katello_content_view_versions,
       :name => "katello_content_view_environments_version_fk", :column => 'content_view_version_id'

data/db/migrate/20140404122011_drop_repositories_enabled_column.rb

@@ -1,4 +1,4 @@
-class DropRepositoriesEnabledColumn < ActiveRecord::Migration
+class DropRepositoriesEnabledColumn < ActiveRecord::Migration[4.2]
   def up
     remove_column :katello_repositories, :enabled
   end

data/db/migrate/20140411134235_update_content_view_description_type.rb

@@ -1,4 +1,4 @@
-class UpdateContentViewDescriptionType < ActiveRecord::Migration
+class UpdateContentViewDescriptionType < ActiveRecord::Migration[4.2]
   def up
     change_column :katello_content_views, :description, :string, :limit => 255
   end

data/db/migrate/20140414214152_allow_null_content_view_to_activation_key.rb

@@ -1,4 +1,4 @@
-class AllowNullContentViewToActivationKey < ActiveRecord::Migration
+class AllowNullContentViewToActivationKey < ActiveRecord::Migration[4.2]
   def up
     change_column :katello_activation_keys, :environment_id, :integer, :null => true
   end

data/db/migrate/20140418124032_add_next_version_to_katello_content_views.rb

@@ -1,4 +1,4 @@
-class AddNextVersionToKatelloContentViews < ActiveRecord::Migration
+class AddNextVersionToKatelloContentViews < ActiveRecord::Migration[4.2]
   def up
     add_column :katello_content_views, :next_version, :int, :null => false, :default => 1
 

data/db/migrate/20140422000001_update_products_add_organization.rb

@@ -1,4 +1,4 @@
-class UpdateProductsAddOrganization < ActiveRecord::Migration
+class UpdateProductsAddOrganization < ActiveRecord::Migration[4.2]
   class Katello::Product < ApplicationRecord
     belongs_to :provider
     self.inheritance_column = nil

data/db/migrate/20140423191446_add_anonymous_providers_to_orgs.rb

@@ -1,4 +1,4 @@
-class AddAnonymousProvidersToOrgs < ActiveRecord::Migration
+class AddAnonymousProvidersToOrgs < ActiveRecord::Migration[4.2]
   def up
     Organization.all.each do |org|
       if org.anonymous_provider.nil?

data/db/migrate/20140425155126_add_host_id_to_system.rb

@@ -1,4 +1,4 @@
-class AddHostIdToSystem < ActiveRecord::Migration
+class AddHostIdToSystem < ActiveRecord::Migration[4.2]
   def up
     add_column :katello_systems, :host_id, :integer
     add_index :katello_systems, :host_id

data/db/migrate/20140429193743_add_release_version_to_activation_keys.rb

@@ -1,4 +1,4 @@
-class AddReleaseVersionToActivationKeys < ActiveRecord::Migration
+class AddReleaseVersionToActivationKeys < ActiveRecord::Migration[4.2]
   def change
     add_column :katello_activation_keys, :release_version, :string, :limit => 255
   end

data/db/migrate/20140502164009_rename_system_groups_to_host_collections.rb

@@ -1,4 +1,4 @@
-class RenameSystemGroupsToHostCollections < ActiveRecord::Migration
+class RenameSystemGroupsToHostCollections < ActiveRecord::Migration[4.2]
   def change
     rename_index :katello_key_system_groups, "index_key_system_groups_on_activation_key_id", "index_key_host_collections_on_activation_key_id"
     rename_index :katello_key_system_groups, "index_key_system_groups_on_system_group_id", "index_key_host_collections_on_host_collection_id"

data/db/migrate/20140502174412_update_host_collections_foreign_keys.rb

@@ -1,4 +1,4 @@
-class UpdateHostCollectionsForeignKeys < ActiveRecord::Migration
+class UpdateHostCollectionsForeignKeys < ActiveRecord::Migration[4.2]
   def up
     remove_foreign_key "katello_key_host_collections", :name => "key_system_groups_activation_key_id_fk"
     remove_foreign_key "katello_key_host_collections", :name => "key_system_groups_system_group_id_fk"

data/db/migrate/20140514165842_create_capsule_lifecycle_environments.rb

@@ -1,4 +1,4 @@
-class CreateCapsuleLifecycleEnvironments < ActiveRecord::Migration
+class CreateCapsuleLifecycleEnvironments < ActiveRecord::Migration[4.2]
   def change
     create_table :katello_capsule_lifecycle_environments do |t|
       t.references :capsule

data/db/migrate/20140531160506_package_filter_add_original_packages.rb

@@ -1,4 +1,4 @@
-class PackageFilterAddOriginalPackages < ActiveRecord::Migration
+class PackageFilterAddOriginalPackages < ActiveRecord::Migration[4.2]
   def up
     add_column :katello_content_view_filters, :original_packages, :boolean, :default => false, :null => false
   end

data/db/migrate/20140610083129_add_pulp_proxy_to_host.rb

@@ -1,4 +1,4 @@
-class AddPulpProxyToHost < ActiveRecord::Migration
+class AddPulpProxyToHost < ActiveRecord::Migration[4.2]
   def change
     add_column :hosts,      :content_source_id, :integer
     add_column :hostgroups, :content_source_id, :integer

data/db/migrate/20140610154745_content_view_puppet_environment_id.rb

@@ -1,4 +1,4 @@
-class ContentViewPuppetEnvironmentId < ActiveRecord::Migration
+class ContentViewPuppetEnvironmentId < ActiveRecord::Migration[4.2]
   class ::Environment < ApplicationRecord
     def self.find_by_katello_id(org, env, content_view)
       katello_id = Environment.construct_katello_id(org, env, content_view)

data/db/migrate/20140610170142_add_uuid_to_content_view_package_group_filter_rule.rb

@@ -1,4 +1,4 @@
-class AddUuidToContentViewPackageGroupFilterRule < ActiveRecord::Migration
+class AddUuidToContentViewPackageGroupFilterRule < ActiveRecord::Migration[4.2]
   def change
     add_column :katello_content_view_package_group_filter_rules, :uuid,
       :string, :limit => 255

data/db/migrate/20140617100300_add_description_to_content_view_filter_rules.rb

@@ -1,4 +1,4 @@
-class AddDescriptionToContentViewFilterRules < ActiveRecord::Migration
+class AddDescriptionToContentViewFilterRules < ActiveRecord::Migration[4.2]
   def up
     add_column :katello_content_view_filters, :description, :string, :limit => 255
   end