Skip to content

Commit

Permalink
Simplify show_package_issues and make it private
Browse files Browse the repository at this point in the history
This is not an action but called from an action, so make it private.
  • Loading branch information
hennevogel committed Dec 21, 2023
1 parent e4fb2c6 commit 625b3bc
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
32 changes: 17 additions & 15 deletions src/api/app/controllers/source_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/api/app/controllers/source_project_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def show
end

def render_project_issues
set_issues_default
set_issues_defaults
render partial: 'source/project_issues'
end

Expand Down

0 comments on commit 625b3bc

Please sign in to comment.