Fixes #38253 - Send error via json so it is propagated to Hammer

Katello · Feb 28, 2025 · f3444e8 · f3444e8
1 parent 83498c4
commit f3444e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb b/app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb
@@ -48,6 +48,8 @@ def set_content_view_environments
             handle_errors(labels: cve_params[:content_view_environments],
               ids: cve_params[:content_view_environment_ids])
           end
+        rescue Katello::Errors::MultiEnvironmentNotSupportedError => e
+          handle_multicv_not_enabled(e)
         end
 
         def cve_params

diff --git a/app/controllers/katello/concerns/api/v2/multi_cv_params_handling.rb b/app/controllers/katello/concerns/api/v2/multi_cv_params_handling.rb
@@ -19,6 +19,10 @@ def handle_errors(labels: [], ids: [])
           :with_logging => true
         )
       end
+
+      def handle_multicv_not_enabled(e)
+        render :json => { :error => { :message => e.message }}, :status => :bad_request
+      end
     end
   end
 end