katello 4.4.2.2 → 4.5.0.rc1

data/app/views/foreman/job_templates/update_group.erb

@@ -1,13 +1,13 @@
 <%#
 kind: job_template
-name: Update Group - Katello SSH Default
+name: Update Group - Katello Script Default
 job_category: Katello
 description_format: 'Install package group(s) %{package}'
 feature: katello_group_update
-provider_type: SSH
+provider_type: script
 foreign_input_sets:
-- template: Package Action - SSH Default
+- template: Package Action - Script Default
   exclude: action
 %>
 
-<%= render_template('Package Action - SSH Default', :action => 'group update') %>
+<%= render_template('Package Action - Script Default', :action => 'group update') %>

data/app/views/foreman/job_templates/update_package.erb

@@ -1,13 +1,13 @@
 <%#
 kind: job_template
-name: Update Package - Katello SSH Default
+name: Update Package - Katello Script Default
 job_category: Katello
 description_format: 'Update package(s) %{package}'
 feature: katello_package_update
-provider_type: SSH
+provider_type: script
 foreign_input_sets:
-- template: Package Action - SSH Default
+- template: Package Action - Script Default
   exclude: action
 %>
 
-<%= render_template('Package Action - SSH Default', :action => 'update') %>
+<%= render_template('Package Action - Script Default', :action => 'update') %>

data/app/views/foreman/job_templates/update_packages_by_search_query.erb

@@ -1,10 +1,10 @@
 <%#
 kind: job_template
-name: Update Packages by search query - Katello SSH Default
+name: Update Packages by search query - Katello Script Default
 job_category: Katello
 description_format: 'Update package(s) %{Packages search query}'
 feature: katello_packages_update_by_search
-provider_type: SSH
+provider_type: script
 template_inputs:
 - name: Packages search query
   description: Filter criteria for packages to be updated.
@@ -16,4 +16,4 @@ template_inputs:
   search: input('Packages search query')
 ) -%>
 
-<%= render_template('Package Action - SSH Default', :action => 'update', :package => package_names.join(' ')) %> 
+<%= render_template('Package Action - Script Default', :action => 'update', :package => package_names.join(' ')) %>

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

@@ -0,0 +1,15 @@
+object @resource
+
+extends 'katello/api/v2/common/identifier'
+
+attributes :name, :base_url, :subpaths, :content_type, :alternate_content_source_type, :smart_proxies, :upstream_username
+
+if params.key?(:include_permissions)
+  node :permissions do |alternate_content_source|
+    {
+      :view_alternate_content_sources => alternate_content_source.readable?,
+      :edit_alternate_content_sources => alternate_content_source.editable?,
+      :destroy_alternate_content_sources => alternate_content_source.deletable?
+    }
+  end
+end

data/app/views/katello/api/v2/alternate_content_sources/index.json.rabl

@@ -0,0 +1,7 @@
+object false
+
+extends "katello/api/v2/common/index"
+
+child @collection[:results] => :results do
+  extends "katello/api/v2/alternate_content_sources/base"
+end

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

@@ -0,0 +1,3 @@
+object @resource
+
+extends "katello/api/v2/alternate_content_sources/base"

data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl

@@ -32,7 +32,7 @@ child @lifecycle_environments => :lifecycle_environments do
     end
 
     node :content_views do |env|
-      env.content_views.map do |content_view|
+      env.content_views.not_generated_for_repository.map do |content_view|
         attributes = {
           :id => content_view.id,
           :label => content_view.label,

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

@@ -4,11 +4,10 @@ attributes :destination_server, :path, :id, :metadata
 attributes :export_type => :type
 
 node :content_view_version do |h|
-  h.content_view_version.name
+  h.content_view_version.name unless h.content_view_version_id.blank?
 end
 
 node :content_view_version_id do |h|
-  h.content_view_version.id
+  h.content_view_version.id unless h.content_view_version_id.blank?
 end
-
 extends 'katello/api/v2/common/timestamps'

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

@@ -25,7 +25,7 @@ node :errata_counts do |version|
 end
 
 child :content_view => :content_view do
-  attributes :id, :name, :label
+  attributes :id, :name, :label, :generated_for
 end
 
 child :composite_content_views => :composite_content_views do

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

@@ -9,6 +9,7 @@ attributes :latest_version, :latest_version_id
 attributes :auto_publish
 attributes :solve_dependencies
 attributes :import_only
+attributes :generated_for
 attributes :related_cv_count
 attributes :related_composite_cvs
 

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

@@ -32,6 +32,8 @@ node :counts do |env|
     counts[:docker_repositories] = repos.docker_type.count
     counts[:ostree_repositories] = repos.ostree_type.count
     counts[:products] = env.organization.products.enabled.count
+    counts[:debs] = Katello::Deb.total_for_repositories(repos)
+    counts[:deb_repositories] = repos.deb_type.count
   end
   counts
 end

data/app/views/katello/api/v2/errata/_counts.json.rabl

@@ -1,7 +1,7 @@
 totals = @object.relation.group(:errata_type).count.with_indifferent_access
 
 node :security do |_presenter|
-  totals[:security]
+  totals[:security].to_i
 end
 
 node :bugfix do |_presenter|
@@ -13,5 +13,5 @@ node :enhancement do |_presenter|
 end
 
 node :total do |_presenter|
-  totals.values.inject(:+)
+  totals.values.inject(:+).to_i
 end

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

@@ -2,8 +2,8 @@ object @resource
 
 attributes :status, :installed_profiles
 attributes :upgradable? => :upgradable
-attributes :install_status? => :install_status
+attributes :install_status => :install_status
 
 glue(@object.available_module_stream) do
-  attributes :name, :stream, :module_spec
+  attributes :id, :name, :stream, :module_spec
 end

data/app/views/katello/api/v2/hosts/host_collections.json.rabl

@@ -1,3 +1,3 @@
 child :host_collections => :host_collections do
-  attributes :id, :name
+  attributes :id, :name, :description, :max_hosts, :unlimited_hosts, :total_hosts
 end

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

@@ -24,7 +24,13 @@ node :default_content_view_id do |org|
 end
 
 node(:composite_content_views_count) { Katello::ContentView.readable&.in_organization(Organization.current)&.composite&.count }
-node(:content_view_components_count) { Katello::ContentView.readable&.in_organization(Organization.current)&.non_composite&.non_default&.count }
+node(:content_view_components_count) do
+  Katello::ContentView.readable&.
+    in_organization(Organization.current)&.
+    non_composite&.
+    non_default&.
+    not_generated_for_repository&.count
+end
 
 node :library_id do |org|
   org.library.id

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

@@ -70,7 +70,8 @@ end
 
 node :permissions do |repo|
   {
-    :deletable => repo.deletable?
+    :deletable => repo.deletable?,
+    :deletable_across_cv => Setting[:delete_repo_across_cv]
   }
 end
 

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

@@ -14,40 +14,19 @@
   <td class="size" data-size="<%= @repo_status[repo.id][:size] %>">
     <%= @repo_status[repo.id][:sync_id] ? @repo_status[repo.id][:display_size]  : _('N/A')%>
   </td>
-  <% if @repo_status[repo.id][:sync_id] %>
-    <td class="result">
+  <td class="result">
       <span class="result-info">
+        <% if @repo_status[repo.id][:sync_id] %>
           <a href="/foreman_tasks/tasks/<%= @repo_status[repo.id][:sync_id] %>">
             <%= @repo_status[repo.id][:state] %>
           </a>
+        <% elsif repo&.latest_sync_audit&.created_at %>
+          <%= _("Synced ") + time_ago_in_words(repo&.latest_sync_audit&.created_at) + _(" ago.") %>
+        <% else%>
+          <%= @repo_status[repo.id][:state] %>
+        <% end %>
       </span>
-      <a class="info-tipsy clickable fa fa-warning <%= 'hidden' if @repo_status[repo.id][:raw_state] != 'error' %>"
-         href="/foreman_tasks/tasks/<%= @repo_status[repo.id][:sync_id] %>">
-        <span class="hidden-text hidden">
-          <div class="la error-tipsy">
-            <ul>
-              <% if @repo_status[repo.id][:error_details].present? && error_state?(@repo_status[repo.id]) %>
-                <% @repo_status[repo.id][:error_details][:messages].each do |error| %>
-                  <li>
-                    <%= error %>
-                  </li>
-                <% end %>
-              <% end %>
-            </ul>
-          </div>
-        </span>
-      </a>
-    </td>
-  <% elsif repo&.latest_sync_audit&.created_at %>
-    <td>
-      <%= _("Synced ") + time_ago_in_words(repo&.latest_sync_audit&.created_at) + _(" ago.") %>
-    </td>
-  <% else%>
-    <td>
-      <%= @repo_status[repo.id][:state] %>
-    </td>
-  <% end %>
-
+  </td>
   <% if @show_org %>
     <td></td>
   <% end %>

data/config/routes/api/v2.rb

@@ -123,6 +123,7 @@ Katello::Engine.routes.draw do
           collection do
             post :version
             post :library
+            post :repository
             get :index
           end
         end
@@ -133,6 +134,7 @@ Katello::Engine.routes.draw do
           collection do
             post :version
             post :library
+            post :repository
           end
         end
 
@@ -152,6 +154,7 @@ Katello::Engine.routes.draw do
           collection do
             post :version
             post :library
+            post :repository
           end
         end
 
@@ -466,6 +469,10 @@ Katello::Engine.routes.draw do
           get :auto_complete_search, :on => :collection
           put :sync
         end
+
+        api_resources :alternate_content_sources, :only => [:index, :show, :create, :update, :destroy] do
+          get :auto_complete_search, :on => :collection
+        end
       end # module v2
     end # '/api' namespace
   end # '/katello' namespace