katello 3.3.2 → 3.4.0.rc1

data/app/views/katello/api/v2/subscription_facet/show.json.rabl

@@ -1,6 +1,6 @@
 child :subscription_facet => :subscription_facet_attributes do |facet|
   extends 'katello/api/v2/subscription_facet/base'
-  consumer = Katello::Candlepin::Consumer.new(facet.uuid)
+  consumer = Katello::Candlepin::Consumer.new(facet.uuid, facet.host.organization.label)
 
   node :compliance_reasons do
     consumer.compliance_reasons

data/app/views/katello/api/v2/subscriptions/base.json.rabl

@@ -15,6 +15,7 @@ attributes :type
 attributes :name => :product_name
 attributes :unmapped_guest
 attributes :virt_only
+attributes :virt_who
 
 node :host, :if => lambda { |sub| sub && sub.hypervisor } do |subscription|
   {

data/app/views/katello/providers/redhat/_repo_sets.html.erb

@@ -32,7 +32,7 @@
                       <tr class="collapsed repo_set" id="repo_set_<%= product_content.content.id %>">
                         <td>
                           <span class="expander_area clickable"
-                                data-url="<%= available_repositories_product_path(product.id)%>"
+                                data-url="<%= katello.available_repositories_product_path(product.id)%>"
                                 data-content-id="<%= product_content.content.id %>"
                                 data-orphaned="<%= orphaned.to_s %>">
                             <%= image_tag( "katello/icons/spinner.gif", :class=>"hidden fl repo_set_spinner",

data/app/views/katello/providers/redhat/_repos.html.erb

@@ -30,7 +30,7 @@
                      id="input_repo_<%= result[:pulp_id] %>"
                      type="checkbox"
                      value="<%= result[:pulp_id] %>"
-                     data-url="<%= toggle_repository_product_path(scan_cdn.input[:product_id]) %>"
+                     data-url="<%= katello.toggle_repository_product_path(scan_cdn.input[:product_id]) %>"
                      data-content-id="<%= scan_cdn.input[:content_id] %>"
                      data-pulp-id="<%= result[:pulp_id] %>"
                      <% if result[:registry_name] %>

data/app/views/katello/providers/redhat/show.html.erb

@@ -23,7 +23,7 @@
       <ul>
         <% for tab in tabs %>
           <li>
-            <a href="<%= redhat_provider_tab_providers_path({:tab => tab[:id]}) %>">
+            <a href="<%= katello.redhat_provider_tab_providers_path({:tab => tab[:id]}) %>">
               <%= tab[:name] %>
             </a>
           </li>

data/app/views/overrides/activation_keys/_host_environment_select.html.erb

@@ -1,3 +1,4 @@
+<% f ||= form %>
 <%= javascript "katello/hosts/host_and_hostgroup_edit" %>
 <style>
     option.kt-env { margin-left: 0em; }
@@ -42,4 +43,4 @@ end %>
   else
     select_tag cs_select_id, options_from_collection_for_select(proxies, :id, :name, (@hostgroup || @host).content_source_id), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cs_select_name, include_blank: true
   end
-end %>
+end %>

data/app/views/overrides/hosts/_subscription_link.html.erb

@@ -1,6 +1,6 @@
 <%= link_to(
         _('Content'),
-        "/content_hosts/#{@host.id}/info",
+        "/content_hosts/#{@host.id}",
         :title => _("Host content and subscription details"),
         :class => 'btn btn-default') if (@host.content_facet || @host.subscription_facet)
 %>

data/config/initializers/pagelets.rb

@@ -0,0 +1,6 @@
+# initialize katello related pagelets
+Pagelets::Manager.with_key "hosts/_form" do |mgr|
+  mgr.add_pagelet :main_tab_fields,
+    :partial => "overrides/activation_keys/host_environment_select",
+    :priority => 80
+end

data/config/routes/api/v2.rb

@@ -5,6 +5,7 @@ class ActionDispatch::Routing::Mapper
   include Katello::Routing::MapperExtensions
 end
 
+# rubocop:disable Metrics/BlockLength
 Katello::Engine.routes.draw do
   scope :katello, :path => '/katello' do
     namespace :api do
@@ -104,6 +105,7 @@ Katello::Engine.routes.draw do
           member do
             post :promote
             post :export
+            put :republish_repositories
           end
           collection do
             get :auto_complete_search
@@ -121,6 +123,7 @@ Katello::Engine.routes.draw do
         api_resources :docker_tags, :only => [:index, :show] do
           collection do
             get :auto_complete_search
+            get :auto_complete_name
           end
         end
 
@@ -190,6 +193,8 @@ Katello::Engine.routes.draw do
         api_resources :package_groups, :only => [:index, :show] do
           collection do
             get :auto_complete_search
+            post :create
+            delete :destroy
           end
         end
 
@@ -227,6 +232,9 @@ Katello::Engine.routes.draw do
             get :auto_complete_search
             get :repository_types
           end
+          member do
+            put :republish
+          end
         end
 
         api_resources :repository_sets, :only => [:index, :show] do

data/config/routes/overrides.rb

@@ -65,6 +65,7 @@ Foreman::Application.routes.draw do
             match '/bulk/add_subscriptions' => 'hosts_bulk_actions#add_subscriptions', :via => :put
             match '/bulk/remove_subscriptions' => 'hosts_bulk_actions#remove_subscriptions', :via => :put
             match '/bulk/auto_attach' => 'hosts_bulk_actions#auto_attach', :via => :put
+            match '/bulk/content_overrides' => 'hosts_bulk_actions#content_overrides', :via => :put
 
             match '/bulk/install_content' => 'hosts_bulk_actions#install_content', :via => :put
             match '/bulk/installable_errata' => 'hosts_bulk_actions#installable_errata', :via => :post

data/db/migrate/20161209162947_add_virt_who_to_katello_pools.rb

@@ -0,0 +1,9 @@
+class AddVirtWhoToKatelloPools < ActiveRecord::Migration
+  def up
+    add_column :katello_pools, :virt_who, :boolean, :default => false, :null => false
+  end
+
+  def down
+    remove_column :katello_pools, :virt_who
+  end
+end

data/db/migrate/20170114051758_add_depth_to_repositories.rb

@@ -0,0 +1,6 @@
+class AddDepthToRepositories < ActiveRecord::Migration
+  def change
+    add_column :katello_repositories, :ostree_upstream_sync_policy, :string, :limit => 25
+    add_column :katello_repositories, :ostree_upstream_sync_depth, :integer
+  end
+end

data/db/migrate/20170122204325_add_hypervisor_to_subscription_facets.rb

@@ -0,0 +1,6 @@
+class AddHypervisorToSubscriptionFacets < ActiveRecord::Migration
+  def change
+    add_column :katello_subscription_facets, :hypervisor, :boolean, :default => false
+    add_column :katello_subscription_facets, :hypervisor_host_id, :integer
+  end
+end

data/db/migrate/20170125152421_move_default_location_to_settings.rb

@@ -0,0 +1,25 @@
+class MoveDefaultLocationToSettings < ActiveRecord::Migration
+  DEFAULT_LOCATION_SETTINGS = ['default_location_subscribed_hosts',
+                               'default_location_puppet_content'].freeze
+  def up
+    default_location = Location.find_by(:katello_default => true)
+    if default_location.present?
+      DEFAULT_LOCATION_SETTINGS.each do |location_setting|
+        Setting.find_by_name(location_setting).update_attribute(
+          :value, default_location.title)
+      end
+    end
+    remove_column :taxonomies, :katello_default
+  end
+
+  def down
+    add_column :taxonomies, :katello_default, :boolean, :null => false,
+      :default => false
+    DEFAULT_LOCATION_SETTINGS.each do |location_setting|
+      default_location = Location.find_by_title(Setting[location_setting])
+      if default_location.present?
+        default_location.update_attribute(:katello_default, true)
+      end
+    end
+  end
+end

data/db/migrate/20170208215148_add_docker_repo_name.rb

@@ -0,0 +1,14 @@
+class AddDockerRepoName < ActiveRecord::Migration
+  def up
+    add_column :katello_repositories, :container_repository_name, :string
+
+    Katello::Repository.docker_type.find_each do |repo|
+      repo.set_container_repository_name
+      repo.save!
+    end
+  end
+
+  def down
+    remove_column :katello_repositories, :container_repository_name
+  end
+end

data/db/migrate/20170222131211_change_pool_columns_to_dates.rb

@@ -0,0 +1,19 @@
+class ChangePoolColumnsToDates < ActiveRecord::Migration
+  def up
+    unless connection.adapter_name.downcase.include?('sqlite')
+      change_column(:katello_pools, :start_date, 'timestamp USING CAST(start_date AS timestamp without time zone)')
+      change_column(:katello_pools, :end_date, 'timestamp USING CAST(end_date AS timestamp without time zone)')
+    end
+    add_index(:katello_pools, :start_date)
+    add_index(:katello_pools, :end_date)
+  end
+
+  def down
+    unless connection.adapter_name.downcase.include?('sqlite')
+      change_column(:katello_pools, :start_date, :string, :limit => 255)
+      change_column(:katello_pools, :end_date, :string, :limit => 255)
+    end
+    remove_index(:katello_pools, :start_date)
+    remove_index(:katello_pools, :end_date)
+  end
+end

data/db/seeds.d/101-locations.rb

@@ -4,9 +4,15 @@
 # !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
 #
 
-if Location.exists? && !Location.default_location
+if Location.exists? &&
+    !Setting[:default_location_subscribed_hosts].present? ||
+    !Setting[:default_location_puppet_content].present?
   # Create a new location to be used as the Katello Default.
-  Location.create!(:name => "Default Location") do |loc|
-    loc.katello_default = true
+  default_location = Location.where(:name => ENV['SEED_LOCATION']).first_or_create
+  if Setting[:default_location_subscribed_hosts].empty?
+    Setting[:default_location_subscribed_hosts] = default_location.title
+  end
+  if Setting[:default_location_puppet_content].empty?
+    Setting[:default_location_puppet_content] = default_location.title
   end
 end

data/db/seeds.d/103-provisioning_templates.rb

@@ -36,8 +36,8 @@ end
 # Ensure all default templates are seeded into the first org and loc
 ProvisioningTemplate.where(:default => true).each do |template|
   template.organizations << Organization.first unless template.organizations.include?(Organization.first) || Organization.count.zero?
-  if Location.exists? && Location.default_location && !template.locations.include?(Location.default_location)
-    template.locations << Location.default_location
+  if Location.exists? && !template.location_ids.include?(Location.default_location_ids)
+    template.location_ids << Location.default_location_ids
   end
 end
 

data/db/seeds.d/106-mail_notifications.rb

@@ -5,6 +5,12 @@
 #
 ::User.current = ::User.anonymous_api_admin
 
+# The notification names are used as humanized labels. These need to be
+# translated as well as the description
+N_('Host errata advisory')
+N_('Sync errata')
+N_('Promote errata')
+
 # Mail Notifications
 notifications = [
   {:name              => :host_errata_advisory,

data/db/seeds.d/108-subcription-bookmarks.rb

@@ -0,0 +1,19 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
+#
+
+Bookmark.without_auditing do
+  bookmarks = [
+    {:name => "list hypervisors", :query => 'hypervisor = true', :controller => "hosts"},
+    {:name => "future", :query => 'starts > Today', :controller => "katello_subscriptions"},
+    {:name => "expiring soon", :query => 'expires 30 days from now', :controller => "katello_subscriptions"}
+  ]
+
+  bookmarks.each do |input|
+    next if audit_modified? Bookmark, input[:name], :controller => input[:controller]
+    b = Bookmark.find_or_create_by({ :public => true }.merge(input))
+    fail "Unable to create bookmark: #{format_errors b}" if b.nil? || b.errors.any?
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-key.factory.js

@@ -16,7 +16,6 @@ angular.module('Bastion.activation-keys').factory('ActivationKey',
             copy: {method: 'POST', params: {action: 'copy'}},
             releaseVersions: {method: 'GET', params: {action: 'releases'}},
             subscriptions: {method: 'GET', params: {action: 'subscriptions'}},
-            products: {method: 'GET', params: {action: 'products'}},
             contentHosts: {method: 'GET', params: {action: 'systems'}},
             removeSubscriptions: {method: 'PUT', isArray: false, params: {action: 'remove_subscriptions'}},
             addSubscriptions: {method: 'PUT', isArray: false, params: {action: 'add_subscriptions'}},
@@ -25,7 +24,8 @@ angular.module('Bastion.activation-keys').factory('ActivationKey',
             removeHostCollections: {method: 'PUT', isArray: false, params: {action: 'host_collections'}},
             addHostCollections: {method: 'POST', isArray: false, params: {action: 'host_collections'}},
             contentOverride: {method: 'PUT', isArray: false, params: {action: 'content_override'}},
-            autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
+            autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},
+            repositorySets: {method: 'GET', params: {action: 'product_content'}}
         });
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.controller.js

@@ -27,8 +27,8 @@ angular.module('Bastion.activation-keys').controller('ActivationKeysController',
         };
 
         var nutupane = new Nutupane(ActivationKey, params);
+        $scope.controllerName = 'katello_activation_keys';
         nutupane.masterOnly = true;
         $scope.table = nutupane.table;
-        $scope.controllerName = 'katello_activation_keys';
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.module.js

@@ -12,5 +12,6 @@ angular.module('Bastion.activation-keys', [
     'Bastion.i18n',
     'Bastion.utils',
     'Bastion.components',
-    'Bastion.host-collections'
+    'Bastion.host-collections',
+    'Bastion.repository-sets'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.routes.js

@@ -48,10 +48,10 @@ angular.module('Bastion.activation-keys').config(['$stateProvider', function ($s
     .state('activation-key.products', {
         url: '/products',
         permission: 'view_activation_keys',
-        controller: 'ActivationKeyProductsController',
-        templateUrl: 'activation-keys/details/views/activation-key-products.html',
+        controller: 'ActivationKeyRepositorySetsController',
+        templateUrl: 'activation-keys/details/views/activation-key-repository-sets.html',
         ncyBreadcrumb: {
-            label: '{{ "Products" | translate }}',
+            label: '{{ "Repository Sets" | translate }}',
             parent: 'activation-key.info'
         }
     })

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-add-host-collections.controller.js

@@ -29,6 +29,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAddHostCollec
         };
 
         hostCollectionsPane = new Nutupane(ActivationKey, params, 'availableHostCollections');
+        $scope.controllerName = 'katello_host_collections';
         $scope.table = hostCollectionsPane.table;
 
         $scope.addHostCollections = function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-add-subscriptions.controller.js

@@ -30,6 +30,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAddSubscripti
         };
 
         $scope.contentNutupane = new Nutupane(Subscription, params);
+        $scope.controllerName = 'katello_subscriptions';
         $scope.table = $scope.contentNutupane.table;
         $scope.isAdding = false;
         $scope.contentNutupane.setSearchKey('subscriptionSearch');

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-associations.controller.js

@@ -26,6 +26,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsC
         };
 
         contentHostsNutupane = new Nutupane(Host, params);
+        $scope.controllerName = 'hosts';
         contentHostsNutupane.searchTransform = function (term) {
             var searchQuery, addition = "activation_key_id=" + $scope.$stateParams.activationKeyId;
             if (term === "" || angular.isUndefined(term)) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-host-collections.controller.js

@@ -29,6 +29,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyHostCollectio
         };
 
         hostCollectionsPane = new Nutupane(ActivationKey, params, 'hostCollections');
+        $scope.controllerName = 'katello_host_collections';
         $scope.table = hostCollectionsPane.table;
 
         $scope.removeHostCollections = function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js

@@ -0,0 +1,64 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.activation-keys.controller:ActivationKeyRepositorySetsController
+ *
+ * @requires $scope
+ * @requires translate
+ * @requires Nutupane
+ * @requires ActivationKey
+ * @requires ContentOverrideHelper
+ * @requires GlobalNotification
+ * @requires CurrentOrganization
+ *
+ * @description
+ *   Provides the functionality for the activation-key products action pane.
+ */
+angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySetsController',
+    ['$scope', 'translate', 'Nutupane', 'ActivationKey', 'ContentOverrideHelper', 'GlobalNotification', 'CurrentOrganization',
+    function ($scope, translate, Nutupane, ActivationKey, ContentOverrideHelper, GlobalNotification, CurrentOrganization) {
+        var nutupane, params, saveContentOverride, success, error;
+
+        params = {
+            id: $scope.$stateParams.activationKeyId,
+            'organization_id': CurrentOrganization,
+            enabled: true,
+            'full_result': true,
+            'include_available_content': true
+        };
+
+        $scope.controllerName = 'katello_products';
+        nutupane = new Nutupane(ActivationKey, params, 'repositorySets');
+        $scope.table = nutupane.table;
+
+        success = function () {
+            $scope.table.working = false;
+            GlobalNotification.setSuccessMessage(translate('Repository Sets settings saved successfully.'));
+            nutupane.refresh();
+        };
+
+        error = function (response) {
+            $scope.table.working = false;
+            GlobalNotification.setErrorMessage(response.data.errors);
+        };
+
+        saveContentOverride = function (contentOverrides) {
+            $scope.table.working = true;
+            ActivationKey.contentOverride({id: $scope.$stateParams.activationKeyId}, contentOverrides, success, error);
+        };
+
+        $scope.overrideToEnabled = function () {
+            var contentOverrides = ContentOverrideHelper.getEnabledContentOverrides($scope.table.getSelected());
+            saveContentOverride(contentOverrides);
+        };
+
+        $scope.overrideToDisabled = function () {
+            var contentOverrides = ContentOverrideHelper.getDisabledContentOverrides($scope.table.getSelected());
+            saveContentOverride(contentOverrides);
+        };
+
+        $scope.resetToDefault = function () {
+            var contentOverrides = ContentOverrideHelper.getDefaultContentOverrides($scope.table.getSelected());
+            saveContentOverride(contentOverrides);
+        };
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-subscriptions.controller.js

@@ -25,6 +25,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeySubscriptions
         };
 
         $scope.contentNutupane = new Nutupane(ActivationKey, params, "subscriptions");
+        $scope.controllerName = 'katello_subscriptions';
         $scope.table = $scope.contentNutupane.table;
         $scope.contentNutupane.masterOnly = true;
         $scope.contentNutupane.setSearchKey('subscriptionSearch');