Skip to content

Fixes #38945 - make RH flatpak helper org scoped and minor fixes #11594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeremylenz merged 1 commit into from
Dec 17, 2025
+10 −4
Merged

Fixes #38945 - make RH flatpak helper org scoped and minor fixes #11594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/views/katello/api/v2/flatpak_remotes/index.json.rabl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ extends 'katello/api/v2/flatpak_remotes/permissions'

node :has_redhat_flatpak_remote do
User.as_anonymous_admin do
::Katello::FlatpakRemote.unscoped.where("url LIKE ?", "%flatpaks.redhat.io%").exists?
query = ::Katello::FlatpakRemote.where("url LIKE ?", "%flatpaks.redhat.io%")
query = query.where(organization_id: @organization.id) if @organization
query.exists?
end
end

Expand Down
2 changes: 1 addition & 1 deletion webpack/scenes/FlatpakRemotes/CreateEdit/CreateFlatpakRemoteModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import FlatpakRemotesForm from './FlatpakRemoteform';
const CreateFlatpakModal = ({ show, setIsOpen, hasRedhatRemote }) => (
<Modal
ouiaId="create-flatpak-modal"
title={__('Create Flatpak Remote')}
title={__('Create Flatpak remote')}
variant={ModalVariant.medium}
isOpen={show}
onClose={() => { setIsOpen(false); }}
Expand Down
2 changes: 1 addition & 1 deletion webpack/scenes/FlatpakRemotes/CreateEdit/EditFlatpakRemotesModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import FlatpakRemotesForm from './FlatpakRemoteform';
const EditFlatpakModal = ({ show, setIsOpen, remoteData }) => (
<Modal
ouiaId="edit-flatpak-modal"
title={__('Edit Flatpak Remote')}
title={__('Edit Flatpak remote')}
variant={ModalVariant.medium}
isOpen={show}
onClose={() => { setIsOpen(false); }}
Expand Down
6 changes: 5 additions & 1 deletion webpack/scenes/FlatpakRemotes/CreateEdit/FlatpakRemoteform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,11 @@ const FlatpakRemotesForm = ({ setModalOpen, remoteData, hasRedhatRemote }) => {
actionClose={<AlertActionCloseButton onClose={() => setAlertDismissed(true)} />}
actionLinks={
<React.Fragment>
<AlertActionLink onClick={() => setUrl('https://flatpaks.redhat.io/rhel')}>
<AlertActionLink onClick={() => {
setUrl('https://flatpaks.redhat.io/rhel');
setName(__('Red Hat remote'));
}}
>
{__('Add Red Hat flatpak remote')}
</AlertActionLink>
<AlertActionLink component="a" href="https://access.redhat.com/terms-based-registry/" target="_blank">
Expand Down