katello 4.16.0.rc2 → 4.16.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of katello might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js +9 -3
- data/app/controllers/katello/api/v2/flatpak_remotes_controller.rb +3 -0
- data/app/controllers/katello/concerns/api/v2/registration_controller_extensions.rb +2 -1
- data/app/views/foreman/job_templates/flatpak_login_action.erb +3 -1
- data/lib/katello/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: '0997eb8bebf1634749cb6a1962723661ec39670ec86f8e1c1a370562c20c7b83'
|
|
4
|
+
data.tar.gz: 90c2757c2e68f89fdded5602aca7ea29e78f8dc7d236d4f0449dcb40196cc630
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f53e29dd5208bd178dae867d64d859051240727e1ef072f44de7a49878b8ec52649cb5e54eaaae6c5a3c28dcb958ebe0a876f1a86baf604f5c2e28ded569d7e8
|
|
7
|
+
data.tar.gz: 7c0a67d078504f496e1d160a2058539873bbcdd4293f3e47f815e745583a77d14ac601d328f8ad24693032091478e30a5267c2e7de708b0b7666aeb2c2ecfc1c
|
|
@@ -36,11 +36,17 @@ KT.hosts.fetchEnvironments = function () {
|
|
|
36
36
|
select.find('option').remove();
|
|
37
37
|
if (content_source_id) {
|
|
38
38
|
var url = tfm.tools.foremanUrl('/katello/api/capsules/' + content_source_id);
|
|
39
|
-
var
|
|
40
|
-
|
|
39
|
+
var orgIdsElem = $("#hostgroup_organization_ids");
|
|
40
|
+
var orgIds = orgIdsElem.val();
|
|
41
|
+
if (orgIds === undefined || orgIds === null || orgIds.length === 0) {
|
|
42
|
+
orgIds = orgIdsElem.data('useds');
|
|
43
|
+
}
|
|
44
|
+
if (orgIds === undefined || orgIds === null || orgIds.length === 0) {
|
|
41
45
|
orgIds = [$("#host_organization_id").val()];
|
|
42
46
|
};
|
|
43
|
-
orgIds = orgIds.map(
|
|
47
|
+
orgIds = orgIds.map(function (id) {
|
|
48
|
+
return Number(id);
|
|
49
|
+
});
|
|
44
50
|
$.get(url, function (content_source) {
|
|
45
51
|
$.each(content_source.lifecycle_environments, function(index, env) {
|
|
46
52
|
// Don't show environments that aren't in the selected org. See jQuery.each() docs
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
module Katello
|
|
2
2
|
class Api::V2::FlatpakRemotesController < Katello::Api::V2::ApiController
|
|
3
3
|
include Katello::Concerns::FilteredAutoCompleteSearch
|
|
4
|
+
include ::Foreman::Controller::FilterParameters
|
|
5
|
+
|
|
6
|
+
filter_parameters :token
|
|
4
7
|
|
|
5
8
|
before_action :find_authorized_katello_resource, :except => [:index, :create, :auto_complete_search]
|
|
6
9
|
before_action :find_optional_organization, :only => [:index, :auto_complete_search]
|
|
@@ -5,7 +5,8 @@ module Katello
|
|
|
5
5
|
|
|
6
6
|
def prepare_host
|
|
7
7
|
if params['uuid']
|
|
8
|
-
|
|
8
|
+
host_id = Katello::Host::SubscriptionFacet.find_by(uuid: params['uuid'])&.host_id
|
|
9
|
+
@host = ::Host::Managed.unscoped.find_by(id: host_id)
|
|
9
10
|
if @host.nil?
|
|
10
11
|
msg = _("Host was not found by the subscription UUID: '%s', this can happen if the host is registered already, but not to this instance") % params['uuid']
|
|
11
12
|
fail ActiveRecord::RecordNotFound, msg
|
|
@@ -27,4 +27,6 @@ template_inputs:
|
|
|
27
27
|
%>
|
|
28
28
|
|
|
29
29
|
sudo podman login <%= server_url %> --username <%= username %> --password <%= password %>
|
|
30
|
-
|
|
30
|
+
if test -f "/run/containers/0/auth.json"; then
|
|
31
|
+
sudo cp --update /run/containers/0/auth.json /etc/flatpak/oci-auth.json
|
|
32
|
+
fi
|
data/lib/katello/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: katello
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.16.0
|
|
4
|
+
version: 4.16.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- N/A
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-03-
|
|
11
|
+
date: 2025-03-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|