From 625b3bc0818492e471f25d253d0101ec2e0aca1f Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Wed, 20 Dec 2023 13:22:11 +0100 Subject: [PATCH] Simplify show_package_issues and make it private This is not an action but called from an action, so make it private. --- src/api/app/controllers/source_controller.rb | 32 ++++++++++--------- .../controllers/source_project_controller.rb | 2 +- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/api/app/controllers/source_controller.rb b/src/api/app/controllers/source_controller.rb index b2d062b7ab3..e17c8fd3336 100644 --- a/src/api/app/controllers/source_controller.rb +++ b/src/api/app/controllers/source_controller.rb @@ -51,21 +51,6 @@ def index end end - def set_issues_default - @filter_changes = @states = nil - @filter_changes = params[:changes].split(',') if params[:changes] - @states = params[:states].split(',') if params[:states] - @login = params[:login] - end - - def show_package_issues - raise NoLocalPackage, 'Issues can only be shown for local packages' unless @tpkg - - set_issues_default - @tpkg.update_if_dirty - render partial: 'package_issues' - end - # GET /source/:project/:package def show_package if @deleted_package @@ -436,8 +421,25 @@ def global_command_triggerscmsync pass_to_backend('/source' + build_query_from_hash(params, [:cmd, :scmrepository, :scmbranch, :isdefaultbranch])) end + def set_issues_defaults + @filter_changes = @states = nil + @filter_changes = params[:changes].split(',') if params[:changes] + @states = params[:states].split(',') if params[:states] + @login = params[:login] + end + private + # GET /source/:project/:package?view=issues + # called from show_package + def show_package_issues + raise NoLocalPackage, 'Issues can only be shown for local packages' unless @tpkg + + set_issues_defaults + @tpkg.update_if_dirty + render partial: 'package_issues' + end + def actually_create_incident(project) raise ModifyProjectNoPermission, "no permission to modify project '#{project.name}'" unless User.session!.can_modify?(project) diff --git a/src/api/app/controllers/source_project_controller.rb b/src/api/app/controllers/source_project_controller.rb index a0c384250b7..8799dc8b06e 100644 --- a/src/api/app/controllers/source_project_controller.rb +++ b/src/api/app/controllers/source_project_controller.rb @@ -45,7 +45,7 @@ def show end def render_project_issues - set_issues_default + set_issues_defaults render partial: 'source/project_issues' end