From fa79188fe7d310979578b4ba00f7efb6c5aabcc1 Mon Sep 17 00:00:00 2001 From: Samir Jha Date: Tue, 19 Nov 2024 14:14:17 +0000 Subject: [PATCH] Refs #37989 - Pluralize api docs endpoint and other changes --- .../katello/api/v2/flatpak_remotes_controller.rb | 6 +++--- app/models/katello/flatpak_remote.rb | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/katello/api/v2/flatpak_remotes_controller.rb b/app/controllers/katello/api/v2/flatpak_remotes_controller.rb index 9733a7fb646..7249ad9b0d4 100644 --- a/app/controllers/katello/api/v2/flatpak_remotes_controller.rb +++ b/app/controllers/katello/api/v2/flatpak_remotes_controller.rb @@ -19,7 +19,6 @@ class Api::V2::FlatpakRemotesController < Katello::Api::V2::ApiController api :GET, "/flatpak_remotes", N_("List flatpak remotes") param :organization_id, :number, :desc => N_("organization identifier"), :required => false param :name, String, :desc => N_("Name of the flatpak remote"), :required => false - param :label, String, :desc => N_("Label of the flatpak remote"), :required => false param_group :search, Api::V2::ApiController add_scoped_search_description_for(FlatpakRemote) def index @@ -40,10 +39,11 @@ def show respond :resource => @flatpak_remote end - api :POST, "/flatpak_remote", N_("Create a flatpak remote") + api :POST, "/flatpak_remotes", N_("Create a flatpak remote") param :name, String, :desc => N_("name"), :required => true param :url, String, :desc => N_("url"), :required => true param :organization_id, :number, :desc => N_("organization identifier"), :required => true + param :registry_url, String, :desc => N_("Optional Registry url. Will be updated when remote is scanned.") param_group :flatpak_remote def create flatpak_remote = FlatpakRemote.new(flatpak_remote_params) @@ -67,7 +67,7 @@ def destroy @flatpak_remote.destroy end - api :POST, "/flatpak_remote/:id/scan", N_("Scan a flatpak remote") + api :POST, "/flatpak_remotes/:id/scan", N_("Scan a flatpak remote") param :id, :number, :desc => N_("Flatpak remote numeric identifier"), :required => true def scan task = async_task(::Actions::Katello::Flatpak::ScanRemote, @flatpak_remote) diff --git a/app/models/katello/flatpak_remote.rb b/app/models/katello/flatpak_remote.rb index bebc004ae0e..27229fb409d 100644 --- a/app/models/katello/flatpak_remote.rb +++ b/app/models/katello/flatpak_remote.rb @@ -10,6 +10,7 @@ class FlatpakRemote < Katello::Model validates :name, presence: true validates :url, presence: true validates :organization_id, presence: true + validates :name, :uniqueness => {:scope => :organization_id} scope :seeded, -> { where(:seeded => true) }